Bring back instrumentation to the compile path to support decompiling

for debugging

Author: jpmonettas

src/jvm/clojure/lang/Compiler.java

@@ -7470,12 +7470,17 @@ public static Object eval(Object form, boolean freshLoader) {
 		Object column = (meta != null ? meta.valAt(RT.COLUMN_KEY, COLUMN.deref()) : COLUMN.deref());
 
         IPersistentMap bindings = RT.mapUniqueKeys(LINE, line, COLUMN, column);
+        
+        // [STORM] For each evaluation, before macroexpanding :
+        // We add this same code on the compile path
+        // Supporting the compile path is useful only for debugging, like using
+        // clj-java-decompiler
+        // ------------------------------------------------------------------------
 
         Integer formId = null;
         HashSet<String> formCoords = null;
         Object origForm = form;
-        
-        // [STORM] For each evaluation, before macroexpanding :                
+
         if (form != null &&
 				!Emitter.skipInstrumentation(munge(currentNS().toString()))) {
 			if (!Utils.isAnnoyingLeinNreplForm(origForm)) {
@@ -7494,6 +7499,7 @@ public static Object eval(Object form, boolean freshLoader) {
 				System.out.println("ClojureStorm: skipping lein initialization form instrumentation being evaluated in " + currentNS().toString());
 			}
 		}
+        // ------------------------------------------------------------------------
 		if(meta != null) {
 			Object eval_file = meta.valAt(RT.EVAL_FILE_KEY);
 			if(eval_file != null) {
@@ -8175,15 +8181,50 @@ CONSTANT_IDS, new IdentityHashMap(),
 		for(Object r = LispReader.read(pushbackReader, false, EOF, false, readerOpts); r != EOF;
 			r = LispReader.read(pushbackReader, false, EOF, false, readerOpts))
 			{
-				
+            
+            // [STORM] For each evaluation, before macroexpanding :
+            // We add this same code on the compile path
+            // Supporting the compile path is useful only for debugging, like using
+            // clj-java-decompiler
+            // ------------------------------------------------------------------------
+
+            Object origForm = r;
+            Integer formId = null;
+            HashSet<String> formCoords = null;
+            boolean stormPushedBindings = false;
+            if (r != null &&
+				!Emitter.skipInstrumentation(munge(currentNS().toString()))) {
+                if (!Utils.isAnnoyingLeinNreplForm(origForm)) {
+                    // Calculate the form id
+                    formId = r.hashCode();
+                    formCoords = new HashSet();
+
+                    // Tag the coords
+                    r = Utils.tagStormCoord(r);
+
+                    // Bind FORM_ID so everything down the road knows what form
+                    // they belong to                    
+                    Var.pushThreadBindings(
+                        RT.mapUniqueKeys(FORM_ID, formId,
+			                             FORM_COORDS, formCoords));
+                    stormPushedBindings = true;
+                    } else {
+                    System.out.println("ClojureStorm: skipping lein initialization form instrumentation being evaluated in " + currentNS().toString());
+                    }
+                }
+            // ------------------------------------------------------------------------
 			LINE_AFTER.set(pushbackReader.getLineNumber());
 			COLUMN_AFTER.set(pushbackReader.getColumnNumber());
 			compile1(gen, objx, r);
 			LINE_BEFORE.set(pushbackReader.getLineNumber());
 			COLUMN_BEFORE.set(pushbackReader.getColumnNumber());
 
+            if (stormPushedBindings) Var.popThreadBindings();
 			}
 
+        // generate forms registration
+		Emitter.emitFormsRegistration(gen, forms, sourcePath);
+
 		//end of load
 		gen.returnValue();
 		gen.endMethod();

src/jvm/clojure/storm/Emitter.java

@@ -415,30 +415,33 @@ public static void emitBindTraces(GeneratorAdapter gen, ObjExpr objx, IPersisten
 		}
 	}
 
-	// public static void emitFormsRegistration(GeneratorAdapter gen, List<Object> forms, String sourcePath) {
-    //     Namespace ns = (Namespace) RT.CURRENT_NS.deref();
-    //     String fns = ns.getName().toString();
-
-    //     if (!skipInstrumentation(Compiler.munge(fns))) {
-    //         for (Object form : forms) {
-    //             IPersistentMap fmeta = RT.meta(form);
-    //             if (fmeta != null) {
-    //                 int fline = -1;
-    //                 // when using the decompiler this is being returned as a Long and throwing a cast error
-    //                 // so lets hack it like this
-    //                 Object oline = fmeta.valAt(LINE_KEY);
-    //                 if (oline instanceof Integer) {
-    //                     fline = (Integer) oline;
-    //                     }
-
-    //                 int fid = form.hashCode();
-    //                 gen.push(fid);
-    //                 gen.push(fline);
-    //                 gen.push(fns);
-    //                 gen.push(sourcePath);
-    //                 gen.invokeStatic(TRACER_CLASS_TYPE, Method.getMethod("void registerFormLocation(int, int, String, String)"));
-    //                 }
-    //             }
-    //         }		
-	// }
+    // This is only for the compile path (when calling clojure compile).
+    // Supporting the compile path is useful only for debugging, like using
+    // clj-java-decompiler
+	public static void emitFormsRegistration(GeneratorAdapter gen, List<Object> forms, String sourcePath) {
+        Namespace ns = (Namespace) RT.CURRENT_NS.deref();
+        String fns = ns.getName().toString();
+
+        if (!skipInstrumentation(Compiler.munge(fns))) {
+            for (Object form : forms) {
+                IPersistentMap fmeta = RT.meta(form);
+                if (fmeta != null) {
+                    int fline = -1;
+                    // when using the decompiler this is being returned as a Long and throwing a cast error
+                    // so lets hack it like this
+                    Object oline = fmeta.valAt(LINE_KEY);
+                    if (oline instanceof Integer) {
+                        fline = (Integer) oline;
+                        }
+
+                    int fid = form.hashCode();
+                    gen.push(fid);
+                    gen.push(fline);
+                    gen.push(fns);
+                    gen.push(sourcePath);
+                    gen.invokeStatic(TRACER_CLASS_TYPE, Method.getMethod("void registerFormLocation(int, int, String, String)"));
+                    }
+                }
+            }		
+	}
 }