X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Finternal%2Fcodegen%2Futils%2FClassBuilder.java;h=5316b861dc52e3e7a2e9b6424e0debf29ce96a13;hb=bf5f7cda1b9b64484cc6e53499e38d6785744aec;hp=c3db313ba282a11fc0b70af210b7f9c69220ce9a;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/ClassBuilder.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/ClassBuilder.java index c3db313ba..5316b861d 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/ClassBuilder.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/ClassBuilder.java @@ -28,7 +28,8 @@ public class ClassBuilder { this.className = className; this.superClassName = superClassName; this.classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS); - this.classVisitor = SCLCompilerConfiguration.SHOW_COMPILED_BYTECODE + this.classVisitor = SCLCompilerConfiguration.SHOW_COMPILED_BYTECODE + && SCLCompilerConfiguration.debugFilter(moduleBuilder.namingPolicy.getModuleName()) ? new TraceClassVisitor(classWriter, new PrintWriter(System.out)) : classWriter; classVisitor.visit(Opcodes.V1_5, access, className, null, superClassName, interfaces); @@ -42,6 +43,9 @@ public class ClassBuilder { String methodName, TypeDesc ret, TypeDesc[] params) { + for(TypeDesc param : params) + if(param.equals(TypeDesc.VOID)) + throw new IllegalArgumentException(); MethodVisitor methodVisitor = classVisitor.visitMethod(access, methodName, MethodDesc.forArguments(ret, params).getDescriptor(), null, null); @@ -49,7 +53,7 @@ public class ClassBuilder { return new MethodBuilder(this, moduleBuilder, (access&Opcodes.ACC_STATIC) != 0, methodVisitor, params); } - private MethodVisitor augmentMethodVisitor(String methodName, MethodVisitor methodVisitor) { + private MethodVisitor augmentMethodVisitor(final String methodName, MethodVisitor methodVisitor) { if(SCLCompilerConfiguration.TRACE_MAX_METHOD_SIZE && moduleBuilder != null) { methodVisitor = new CodeSizeEvaluator(methodVisitor) { @Override @@ -68,6 +72,9 @@ public class ClassBuilder { String methodName, TypeDesc ret, TypeDesc[] params) { + for(TypeDesc param : params) + if(param.equals(TypeDesc.VOID)) + throw new IllegalArgumentException(); MethodVisitor methodVisitor = classVisitor.visitMethod(access, methodName, MethodDesc.forArguments(ret, params).getDescriptor(), null, null); @@ -79,6 +86,9 @@ public class ClassBuilder { String methodName, TypeDesc ret, TypeDesc[] params) { + for(TypeDesc param : params) + if(param.equals(TypeDesc.VOID)) + throw new IllegalArgumentException(); MethodVisitor methodVisitor = classVisitor.visitMethod(access, methodName, MethodDesc.forArguments(ret, params).getDescriptor(), null, null); @@ -87,9 +97,13 @@ public class ClassBuilder { methodVisitor.visitEnd(); } - public MethodBuilderBase addConstructor(int access, TypeDesc[] params) { + public MethodBuilderBase addConstructorBase(int access, TypeDesc[] params) { return addMethodBase(access, "", TypeDesc.VOID, params); } + + public MethodBuilder addConstructor(int access, TypeDesc[] params) { + return addMethod(access, "", TypeDesc.VOID, params); + } public MethodBuilder addInitializer() { return addMethod(Opcodes.ACC_PUBLIC, "", TypeDesc.VOID, Constants.EMPTY_TYPEDESC_ARRAY); @@ -101,6 +115,8 @@ public class ClassBuilder { public void addField(int access, String fieldName, TypeDesc type) { + if(type.equals(TypeDesc.VOID)) + throw new IllegalArgumentException(); FieldVisitor fieldVisitor = classVisitor.visitField(access, fieldName, type.getDescriptor(), null, null); fieldVisitor.visitEnd(); } @@ -138,4 +154,8 @@ public class ClassBuilder { System.out.println(); }*/ } + + public ModuleBuilder getModuleBuilder() { + return moduleBuilder; + } }