Fix let/loop bindings not being traced inside reify

Author: jpmonettas

CHANGELOG.md

@@ -3,6 +3,38 @@
 ## master (unreleased)
 
 ### New Features
+    
+### Changes
+                    
+### Bugs fixed 
+    
+## 1.12.0-4 (19-02-2025)
+
+### New Features
+    
+### Changes
+                    
+### Bugs fixed 
+
+    - Fix let/loop bindings not being traced inside reify
+
+## 1.12.0-3 (28-01-2025)
+
+### New Features
+    
+### Changes
+
+    - Bring back instrumentation to the compile path to support decompiling for debugging
+                    
+### Bugs fixed 
+    
+## 1.12.0-2 (27-11-2024)
+
+### New Features
+    
+### Changes
+                    
+### Bugs fixed 
 
     - Trace most statements also
 

src/jvm/clojure/storm/Emitter.java

@@ -369,10 +369,10 @@ public static void emitBindTrace(GeneratorAdapter gen, ObjExpr objx, BindingInit
             String symName = Compiler.demunge(bi.binding().name);
             Integer bIdx = bi.binding().idx;
 
-            if (objx instanceof FnExpr &&
-                !skipInstrumentation(((FnExpr)objx).name()) &&
-                coord != null &&
-                !(symName.equals("-") || symName.contains("--"))) {
+            if (((objx instanceof FnExpr && !skipInstrumentation(((FnExpr)objx).name())) || (objx instanceof NewInstanceExpr && !skipInstrumentation(((NewInstanceExpr)objx).name()))) &&
+					coord != null &&
+					(!(symName.equals("-") || symName.contains("--"))))
+					{
 
                 Type valType = null;
                 Class primc = Compiler.maybePrimitiveType(bi.init());
@@ -393,7 +393,8 @@ public static void emitBindTrace(GeneratorAdapter gen, ObjExpr objx, BindingInit
 	public static void emitBindTraces(GeneratorAdapter gen, ObjExpr objx, IPersistentVector localBindings,
 			IPersistentVector coord) {
 
-		if (bindInstrumentationEnable && objx instanceof FnExpr && !skipInstrumentation(((FnExpr) objx).name())) {
+		if (bindInstrumentationEnable &&
+				((objx instanceof FnExpr && !skipInstrumentation(((FnExpr) objx).name())) || (objx instanceof NewInstanceExpr && !skipInstrumentation(((NewInstanceExpr) objx).name())))) {
 
 			for (int i = 0; i < localBindings.count(); i++) {
 

test/clojure/test_clojure/storm_bodies.clj

@@ -106,6 +106,22 @@
             [:fn-return 15 ""]]
            (u/capture)) "captured traces should match.")))
 
+(deftest reified-let-test
+  (let [r (b/reified-let)]
+    (is (= 30 r) "function return should be right.")
+    (is (=  [[:fn-call "clojure.test-clojure.storm-test-code.bodies" "reified-let" [] 1131527981]
+             [:fn-call "clojure.test-clojure.storm-test-code.bodies" "doit" [] 1131527981]
+             [:bind "a" 10 "3,1,2,2"]
+             [:bind "b" 20 "3,1,2,2"]
+             [:expr-exec 10 "3,1,2,2,2,1"]
+             [:expr-exec 20 "3,1,2,2,2,2"]
+             [:expr-exec 30 "3,1,2,2,2"]
+             [:expr-exec 30 "3,1,2,2"]
+             [:fn-return 30 "3,1,2,0"]
+             [:expr-exec 30 "3"]
+             [:fn-return 30 ""]]
+            (u/capture)) "captured traces should match.")))
+
 (deftest case-test
   (let [r (b/casey :first)]
     (is (= 42 r) "function return should be right.")

test/clojure/test_clojure/storm_test_code/bodies.clj

@@ -34,6 +34,17 @@
             z)]
     c))
 
+(defprotocol PP
+  (doit [_]))
+
+(defn reified-let []
+  (doit
+   (reify PP
+     (doit [_]
+       (let [a 10
+             b 20]
+         (+ a b))))))
+
 (defn casey [x]
   (case x
     :first (+ 40 2)

test/clojure/test_clojure/storm_types.clj

@@ -64,8 +64,10 @@
     (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "area" [rect] 50784036]
             [:bind "r" rect ""]
             [:expr-exec rect "3,2,1,1"]
+            [:bind "gclass" "clojure.test_clojure.storm_test_code.types.Rectangle" ""]
             [:expr-exec 2 "3,2,1"]
             [:expr-exec rect "3,2,2,1"]
+            [:bind "gclass" "clojure.test_clojure.storm_test_code.types.Rectangle" ""]
             [:expr-exec 4 "3,2,2"]
             [:expr-exec 8 "3,2"]
             [:fn-return 8 ""]]