More tidy up from asm5 change.

jon-bell · jon-bell · commit d08872b8cefa · 2017-01-06T19:11:22.000-05:00
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/Instrumenter.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/Instrumenter.java
@@ -116,10 +116,8 @@ private static byte[] instrumentClass(InputStream is) {
 
             ClassWriter cw = new InstrumenterClassWriter(cr, ClassWriter.COMPUTE_MAXS
                     | ClassWriter.COMPUTE_FRAMES, loader);
-            NonDeterministicLoggingClassVisitor cv = new NonDeterministicLoggingClassVisitor(
-                    Opcodes.ASM5, cw);
-            CallbackDuplicatingClassVisitor callbackDuplicator = new CallbackDuplicatingClassVisitor(
-                    Opcodes.ASM5, cv);
+            NonDeterministicLoggingClassVisitor cv = new NonDeterministicLoggingClassVisitor(cw);
+            CallbackDuplicatingClassVisitor callbackDuplicator = new CallbackDuplicatingClassVisitor(cv);
 
             cr.accept(callbackDuplicator, ClassReader.EXPAND_FRAMES);
             if (methodCalls.containsKey(cv.getClassName()))
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/FinalizerReplayingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/FinalizerReplayingMethodVisitor.java
@@ -12,9 +12,9 @@ public class FinalizerReplayingMethodVisitor extends MethodVisitor {
 
     private String className;
 
-    public FinalizerReplayingMethodVisitor(int api, MethodVisitor mv, String name, String desc,
+    public FinalizerReplayingMethodVisitor(MethodVisitor mv, String name, String desc,
             String className) {
-        super(api, mv);
+        super(Opcodes.ASM5, mv);
         this.isFinalize = (name.equals("finalize")) && desc.equals("()V");
         this.className = className;
     }
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/NonDeterministicReplayClassVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/NonDeterministicReplayClassVisitor.java
@@ -55,7 +55,7 @@ public MethodVisitor visitMethod(int acc, String name, String desc, String signa
         {
 
             MethodVisitor smv = cv.visitMethod(acc, name, desc, signature, exceptions);
-            FinalizerReplayingMethodVisitor fmv = new FinalizerReplayingMethodVisitor(acc, smv,
+            FinalizerReplayingMethodVisitor fmv = new FinalizerReplayingMethodVisitor(smv,
                     name, desc, this.className);
             AnalyzerAdapter analyzer = new AnalyzerAdapter(className, acc, name, desc, fmv);
             LocalVariablesSorter sorter = new LocalVariablesSorter(acc, desc, analyzer);
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/ReplayUtils.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/ReplayUtils.java
@@ -82,7 +82,10 @@ public static int getNextIndexO(HashMap replayIndexMap, String[] threadEntries,
 
         checkForDispatch();
         if (threadEntries[r] == null)
+        {
+        	System.err.println("Replay log ended in thread " + threadName);
             System.exit(-1);
+        }
         if (threadEntries[r].equals(threadName)) {
             replayIndexMap.put(threadName, r);
             return r;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackDuplicatingClassVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackDuplicatingClassVisitor.java
@@ -28,8 +28,8 @@ public void visit(int version, int access, String name, String signature, String
         this.className = name;
     }
 
-    public CallbackDuplicatingClassVisitor(int api, ClassVisitor cv) {
-        super(api, cv);
+    public CallbackDuplicatingClassVisitor(ClassVisitor cv) {
+        super(Opcodes.ASM5, cv);
     }
 
     private HashSet<MethodNode> methodsToGenerateLogging = new HashSet<MethodNode>();
@@ -50,10 +50,10 @@ public void visitEnd() {
             // mn.name = "BBB"+mn.name;
             MethodVisitor mv = super.visitMethod(mn.access, mn.name, mn.desc, mn.signature,
                     (String[]) mn.exceptions.toArray(new String[0]));
-            CloningAdviceAdapter caa = new CloningAdviceAdapter(Opcodes.ASM5, mv, mn.access,
+            CloningAdviceAdapter caa = new CloningAdviceAdapter(mv, mn.access,
                     mn.name, mn.desc, className);
             LocalVariablesSorter lvsorter = new LocalVariablesSorter(mn.access, mn.desc, mv);
-            CallbackLoggingMethodVisitor clmv = new CallbackLoggingMethodVisitor(api, mv,
+            CallbackLoggingMethodVisitor clmv = new CallbackLoggingMethodVisitor(mv,
                     mn.access, mn.name, mn.desc, className, lvsorter, caa);
             caa.setLocalVariableSorter(lvsorter);
 
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackLoggingMethodVisitor.java
@@ -25,9 +25,9 @@ public class CallbackLoggingMethodVisitor extends AdviceAdapter implements Opcod
 
     private CloningAdviceAdapter caa;
 
-    public CallbackLoggingMethodVisitor(int api, MethodVisitor mv, int access, String name,
+    public CallbackLoggingMethodVisitor(MethodVisitor mv, int access, String name,
             String desc, String classname, LocalVariablesSorter lvsorter, CloningAdviceAdapter caa) {
-        super(api, mv, access, name, desc);
+        super(Opcodes.ASM5, mv, access, name, desc);
         this.className = classname;
         this.methodName = name;
         this.methodDesc = desc;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CloningAdviceAdapter.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CloningAdviceAdapter.java
@@ -63,9 +63,9 @@ public class CloningAdviceAdapter extends GeneratorAdapter implements Opcodes {
 
     private LocalVariablesSorter lvsorter;
 
-    public CloningAdviceAdapter(int api, MethodVisitor mv, int access, String name, String desc,
+    public CloningAdviceAdapter(MethodVisitor mv, int access, String name, String desc,
             String classname) {
-        super(api, mv, access, name, desc);
+        super(Opcodes.ASM5, mv, access, name, desc);
     }
 
     /**
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/FinalizerLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/FinalizerLoggingMethodVisitor.java
@@ -12,9 +12,9 @@ public class FinalizerLoggingMethodVisitor extends MethodVisitor {
 
     private String className;
 
-    public FinalizerLoggingMethodVisitor(int api, MethodVisitor mv, String name, String desc,
+    public FinalizerLoggingMethodVisitor(MethodVisitor mv, String name, String desc,
             String className) {
-        super(api, mv);
+        super(Opcodes.ASM5, mv);
         this.isFinalize = (name.equals("finalize")) && desc.equals("()V");
         this.className = className;
     }
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/MainLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/MainLoggingMethodVisitor.java
@@ -2,6 +2,7 @@
 package edu.columbia.cs.psl.chroniclerj.visitor;
 
 import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.AdviceAdapter;
 import org.objectweb.asm.commons.Method;
@@ -12,9 +13,9 @@ public class MainLoggingMethodVisitor extends AdviceAdapter {
 
     private String className;
 
-    protected MainLoggingMethodVisitor(int api, MethodVisitor mv, int access, String name,
+    protected MainLoggingMethodVisitor(MethodVisitor mv, int access, String name,
             String desc, String className) {
-        super(api, mv, access, name, desc);
+        super(Opcodes.ASM5, mv, access, name, desc);
         this.className = className;
     }
 
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingClassVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingClassVisitor.java
@@ -47,9 +47,8 @@ public class NonDeterministicLoggingClassVisitor extends ClassVisitor implements
         }
     }
 
-    public NonDeterministicLoggingClassVisitor(int api, ClassVisitor cv) {
-        super(api, cv);
-
+    public NonDeterministicLoggingClassVisitor(ClassVisitor cv) {
+        super(Opcodes.ASM5, cv);
     }
 
     private static Logger logger = Logger.getLogger(NonDeterministicLoggingClassVisitor.class);
@@ -132,19 +131,19 @@ public MethodVisitor visitMethod(int acc, String name, String desc, String signa
             String[] exceptions) {
         // TODO need an annotation to disable doing this to some apps
         MethodVisitor primaryMV = cv.visitMethod(acc, name, desc, signature, exceptions);
-        MethodVisitor smv = new ReflectionInterceptingMethodVisitor(Opcodes.ASM5, primaryMV);
-        smv = new FinalizerLoggingMethodVisitor(acc, smv, name, desc, className);
+        MethodVisitor smv = new ReflectionInterceptingMethodVisitor(primaryMV);
+        smv = new FinalizerLoggingMethodVisitor(smv, name, desc, className);
         if (name.equals("main") && desc.equals("([Ljava/lang/String;)V")) {
-            smv = new MainLoggingMethodVisitor(Opcodes.ASM5, smv, acc, name, desc, className);
+            smv = new MainLoggingMethodVisitor(smv, acc, name, desc, className);
         }
 
         if (classIsCallback(className)) {
             AnalyzerAdapter analyzer = new AnalyzerAdapter(className, acc, name, desc, smv);
             JSRInlinerAdapter mv = new JSRInlinerAdapter(analyzer, acc, name, desc, signature,
                     exceptions);
-            CloningAdviceAdapter caa = new CloningAdviceAdapter(Opcodes.ASM5, mv, acc, name, desc,
+            CloningAdviceAdapter caa = new CloningAdviceAdapter(mv, acc, name, desc,
                     className);
-            smv = new CallbackLoggingMethodVisitor(Opcodes.ASM5, caa, acc, name, desc, className,
+            smv = new CallbackLoggingMethodVisitor(caa, acc, name, desc, className,
                     null, caa);
             smv = new JSRInlinerAdapter(smv, acc, name, desc, signature, exceptions);
             smv = new LocalVariablesSorter(acc, desc, smv);
@@ -162,14 +161,15 @@ public MethodVisitor visitMethod(int acc, String name, String desc, String signa
             // LocalVariablesSorter sorter = new LocalVariablesSorter(acc, desc,
             // analyzer);
 
-            // CheckMethodAdapter cmv = new CheckMethodAdapter(mv);
-
             NonDeterministicLoggingMethodVisitor cloningMV = new NonDeterministicLoggingMethodVisitor(
-                    Opcodes.ASM4, mv, acc, name, desc, className, isFirstConstructor, analyzer);
+                    mv, acc, name, desc, className, isFirstConstructor);
             if (name.equals("<init>"))
                 isFirstConstructor = false;
             cloningMV.setClassVisitor(this);
-            JSRInlinerAdapter mv2 = new JSRInlinerAdapter(cloningMV, acc, name, desc, signature,
+            AnalyzerAdapter preAnalyzer = new AnalyzerAdapter(className, acc, name, desc, cloningMV);
+            cloningMV.setPreAnalyzer(preAnalyzer);
+            
+            JSRInlinerAdapter mv2 = new JSRInlinerAdapter(preAnalyzer, acc, name, desc, signature,
                     exceptions);
             LocalVariablesSorter sorter = new LocalVariablesSorter(acc, desc, mv2);
             cloningMV.setLocalVariableSorter(sorter);
@@ -195,7 +195,6 @@ public void addFieldMarkup(Collection<MethodCall> calls) {
 
     @Override
     public void visitEnd() {
-        super.visitEnd();
 
         for (MethodCall mc : captureMethodsToGenerate.keySet()) {
             MethodInsnNode mi = captureMethodsToGenerate.get(mc);
@@ -215,7 +214,7 @@ else if (mi.getOpcode() != Opcodes.INVOKESTATIC) {
             }
             MethodVisitor mv = super.visitMethod(opcode, mc.getCapturePrefix() + "_capture",
                     captureDesc, null, null);
-            CloningAdviceAdapter caa = new CloningAdviceAdapter(Opcodes.ASM5, mv, opcode,
+            CloningAdviceAdapter caa = new CloningAdviceAdapter(mv, opcode,
                     mc.getCapturePrefix() + "_capture", captureDesc, className);
             LocalVariablesSorter lvs = new LocalVariablesSorter(opcode, captureDesc, caa);
             caa.setLocalVariableSorter(lvs);
@@ -269,6 +268,7 @@ else if (mi.getOpcode() != Opcodes.INVOKESTATIC) {
                     "J", null, 0L);
             fn.accept(this);
         }
+        super.visitEnd();
     }
 
     public String getClassName() {
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingMethodVisitor.java
@@ -38,8 +38,6 @@ public class NonDeterministicLoggingMethodVisitor extends CloningAdviceAdapter {
 
     private boolean superInitialized;
 
-    private AnalyzerAdapter analyzer;
-
     private static HashSet<String> ignoredNDMethods = new HashSet<String>();
 
     public static boolean isND(String owner, String name, String desc) {
@@ -79,17 +77,15 @@ public void visitCode() {
 
     private boolean isFirstConstructor;
 
-    protected NonDeterministicLoggingMethodVisitor(int api, MethodVisitor mv, int access,
-            String name, String desc, String classDesc, boolean isFirstConstructor,
-            AnalyzerAdapter analyzer) {
-        super(api, mv, access, name, desc, classDesc);
+    protected NonDeterministicLoggingMethodVisitor(MethodVisitor mv, int access,
+            String name, String desc, String classDesc, boolean isFirstConstructor) {
+        super(mv, access, name, desc, classDesc);
         this.name = name;
         this.desc = desc;
         this.classDesc = classDesc;
         this.isStatic = (access & Opcodes.ACC_STATIC) != 0;
         this.constructor = "<init>".equals(name);
         this.isFirstConstructor = isFirstConstructor;
-        this.analyzer = analyzer;
     }
 
     private NonDeterministicLoggingClassVisitor parent;
@@ -283,4 +279,9 @@ public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels)
         super.visitTableSwitchInsn(min, max, dflt, labels);
         pc++;
     }
+    
+    private AnalyzerAdapter preAnalyzer;
+	public void setPreAnalyzer(AnalyzerAdapter preAnalyzer) {
+		this.preAnalyzer = preAnalyzer;
+	}
 }
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/ReflectionInterceptingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/ReflectionInterceptingMethodVisitor.java
@@ -6,8 +6,8 @@
 
 public class ReflectionInterceptingMethodVisitor extends MethodVisitor {
 
-    public ReflectionInterceptingMethodVisitor(int api, MethodVisitor mv) {
-        super(api, mv);
+    public ReflectionInterceptingMethodVisitor(MethodVisitor mv) {
+        super(Opcodes.ASM5, mv);
     }
 
     @Override
diff --git a/Code/ChroniclerJ/src/main/resources/log4j.properties b/Code/ChroniclerJ/src/main/resources/log4j.properties
@@ -15,6 +15,4 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=[in-vivo - %t (%d)] %p %C.%M(%L) | %m%n
 
 #core packages
-#log4j.logger.org.geworkbench.engine.config.UILauncher=INFO
-#log4j.logger.org.geworkbench.engine.management.ComponentRegistry=INFO
 log4j.logger.edu.columbia.cs.psl.invivo.record.analysis.MutabilityAnalyzer=INFO

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public MethodVisitor visitMethod(int acc, String name, String desc, String signa`
`55`	`55`	`{`
`56`	`56`
`57`	`57`	`MethodVisitor smv = cv.visitMethod(acc, name, desc, signature, exceptions);`
`58`		`- FinalizerReplayingMethodVisitor fmv = new FinalizerReplayingMethodVisitor(acc, smv,`
	`58`	`+ FinalizerReplayingMethodVisitor fmv = new FinalizerReplayingMethodVisitor(smv,`
`59`	`59`	`name, desc, this.className);`
`60`	`60`	`AnalyzerAdapter analyzer = new AnalyzerAdapter(className, acc, name, desc, fmv);`
`61`	`61`	`LocalVariablesSorter sorter = new LocalVariablesSorter(acc, desc, analyzer);`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ public class CloningAdviceAdapter extends GeneratorAdapter implements Opcodes {`
`63`	`63`
`64`	`64`	`private LocalVariablesSorter lvsorter;`
`65`	`65`
`66`		`- public CloningAdviceAdapter(int api, MethodVisitor mv, int access, String name, String desc,`
	`66`	`+ public CloningAdviceAdapter(MethodVisitor mv, int access, String name, String desc,`
`67`	`67`	`String classname) {`
`68`		`- super(api, mv, access, name, desc);`
	`68`	`+ super(Opcodes.ASM5, mv, access, name, desc);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`