Refactor to remove asm-commons dep; install asm-tree

Author: sorear

3rdparty/asm/asm-commons-4.1.jar

@@ -6,7 +6,6 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
-import org.objectweb.asm.commons.CodeSizeEvaluator;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.FieldInsnNode;
 import org.objectweb.asm.tree.IincInsnNode;
@@ -85,10 +84,11 @@ public AutosplitMethodWriter(ClassVisitor target, String tgtype, int access, Str
     public void visitEnd() {
         super.visitEnd();
 
-        CodeSizeEvaluator cse = new CodeSizeEvaluator(null);
-        accept(cse);
+        int maxsize = 0;
+        for (AbstractInsnNode ai = instructions.getFirst(); ai != null; ai = ai.getNext())
+            maxsize += insnSize(ai);
 
-        if (cse.getMaxSize() <= MAX_UNSPLIT_METHOD) {
+        if (maxsize <= MAX_UNSPLIT_METHOD) {
             // hey cool, we don't need to do anything fancy here
             MethodVisitor mw = target.visitMethod(access, name, desc, signature, ((List<String>)exceptions).toArray(new String[0]));
             accept(mw);
@@ -97,7 +97,7 @@ public void visitEnd() {
 
         /* we need to split this thing */
 
-        if (DEBUG_FRAGMENT) System.out.printf("method=%s min=%d max=%d\n", name, cse.getMinSize(), cse.getMaxSize());
+        if (DEBUG_FRAGMENT) System.out.printf("method=%s max=%d\n", name, maxsize);
 
         splitSwitches();
         getInstructions();
@@ -946,7 +946,7 @@ private int insnSize(AbstractInsnNode ai) {
             case AbstractInsnNode.MULTIANEWARRAY_INSN:
                 return 4;
             default:
-                throw new RuntimeException();
+                return 0;
         }
     }
 

src/vm/jvm/runtime/org/perl6/nqp/jast2bc/AutosplitMethodWriter.java

@@ -19,7 +19,7 @@ RUNTIME_JAVAS = \
 
 RUNTIME_JAR = nqp-runtime.jar
 
-THIRDPARTY_JARS = $(ASM)asm-4.1.jar@cpsep@$(ASM)asm-tree-4.1.jar@cpsep@$(ASM)asm-commons-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar
+THIRDPARTY_JARS = $(ASM)asm-4.1.jar@cpsep@$(ASM)asm-tree-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar
 STAGE0 = src/vm/jvm/stage0
 STAGE1 = src/stage1
 STAGE2 = src/stage2
@@ -162,6 +162,7 @@ all: $(ALL_OUTPUT) $(RUNNER) $(P5QREGEX_JAR)
 install: all
 	$(MKPATH) $(PREFIX)
 	$(CP) 3rdparty/asm/asm-4.1.jar $(PREFIX)
+	$(CP) 3rdparty/asm/asm-tree-4.1.jar $(PREFIX)
 	$(CP) 3rdparty/jline/jline-1.0.jar $(PREFIX)
 	$(CP) $(RUNTIME_JAR) $(PREFIX)
 	$(CP) $(NQP_MO_JAR) $(PREFIX)