Trace objects methods calls as ClassName.method-name, instead of just method-name

Author: jpmonettas

CHANGELOG.md

@@ -5,6 +5,18 @@
 ### New Features
 
 ### Changes
+
+    - Trace objects methods calls as ClassName.method-name, instead of just method-name
+                        
+### Bugs fixed 
+
+## 1.12.2 (26-08-2025)
+
+### New Features
+    
+### Changes
+
+    - Just rebasing on top of official 1.12.2
                         
 ### Bugs fixed 
 

pom.xml

@@ -5,7 +5,7 @@
   <artifactId>clojure</artifactId>
   <name>clojure</name>
   <packaging>jar</packaging>
-  <version>1.12.0-10</version>
+  <version>1.12.2-1</version>
   <url>http://clojure.org/</url>
   <description>Clojure core environment and runtime library.</description>
 

src/clj/clojure/core_deftype.clj

@@ -836,7 +836,7 @@
                                         specs)]
                  (map (fn [[[target & args] & body]]
                         (cons (with-meta (apply vector (vary-meta target assoc :tag c) args)
-                                {:clojure.storm/fn-trace-sym mname})
+                                {:clojure.storm/fn-trace-sym (symbol (str c "." mname))})
                               body))
                       specs)))]
     [p (zipmap (map #(-> % first name keyword) fs)

src/jvm/clojure/lang/Compiler.java

@@ -8751,7 +8751,7 @@ CONSTANT_IDS, new IdentityHashMap(),
 			{
 
             // [STORM] For each evaluation, before macroexpanding :
-            // We add this same code on the compile path
+            // This is the same code added in the load path
             // Supporting the compile path is useful only for debugging, like using
             // clj-java-decompiler
             // ------------------------------------------------------------------------
@@ -9584,6 +9584,19 @@ private static Map findMethodsWithName(String name, Map mm){
 		return ret;
 	}
 
+	private String objectClassName(String objExprName) {
+		String objClassName = "";
+		int dotIdx=objExprName.lastIndexOf(".");
+		if (objExprName.indexOf("reify__") != -1) {
+			objClassName = objExprName.substring(objExprName.indexOf("reify__"));
+		} else if (dotIdx != -1) {
+			objClassName = objExprName.substring(dotIdx + 1);
+		}
+		else {
+			objClassName = objExprName;
+		}
+		return objClassName;
+	}
 	public void emit(ObjExpr obj, ClassVisitor cv){
 		Method m = new Method(getMethodName(), getReturnType(), getArgTypes());
 
@@ -9607,12 +9620,15 @@ public void emit(ObjExpr obj, ClassVisitor cv){
 			}
 		gen.visitCode();
 
-		
-		String fqMethodName = Compiler.munge(Compiler.currentNS().name.name) + "$" + getMethodName();
+
+		String fqMethodName = "";
 
         Label prologueTryStartLabel = null;
-		if(!skipFnCallTrace)
+
+		if(!skipFnCallTrace) {
+			fqMethodName = Compiler.munge(Compiler.currentNS().name.name) + "$" + objectClassName(obj.name()) + "." + getMethodName();
 			prologueTryStartLabel = Emitter.emitFnPrologue(gen, obj, fqMethodName, extypes, argLocals);
+		}
 
 		Label loopLabel = gen.mark();
 

test/clojure/test_clojure/storm_bodies.clj

@@ -107,20 +107,28 @@
            (u/capture)) "captured traces should match.")))
 
 (deftest reified-let-test
-  (let [r (b/reified-let)]
+  (let [r (b/reified-let)
+        [a [b1 b2 b3 b4 b5] & rs] (u/capture)]
     (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.")))
+
+    (is (= a [:fn-call "clojure.test-clojure.storm-test-code.bodies" "reified-let" [] 1131527981]))
+    
+    (is (= b1 :fn-call))
+    (is (= b2 "clojure.test-clojure.storm-test-code.bodies"))
+    (is (re-find #"reify--[0-9]+\.doit" b3))
+    (is (= b4 []))
+    (is (= b5 1131527981))
+
+    (is (= (into [] rs)
+           [[: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 ""]]) "captured traces should match.")))
 
 (deftest case-test
   (let [r (b/casey :first)]

test/clojure/test_clojure/storm_types.clj

@@ -9,7 +9,7 @@
   (let [s (ts/->Square 5)
         r (ts/area s)]
     (is (= 25 r) "function return should be right.")
-    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "area" [] 1908634760]
+    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "Square.area" [] 1908634760]
             [:expr-exec 5 "4,2,1"]
             [:expr-exec 5 "4,2,2"]
             [:expr-exec 25 "4,2"]
@@ -19,7 +19,7 @@
 (deftest deftype-test
   (let [r (ts/area (ts/->Circle 2))]
     (is (= 12.56 r) "function return should be right.")
-    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "area" [] 441667179]
+    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "Circle.area" [] 441667179]
             [:expr-exec 2 "4,2,2"]
             [:expr-exec 2 "4,2,3"]
             [:expr-exec 12.56 "4,2"]
@@ -29,7 +29,7 @@
 (deftest extend-type-basic-test
   (let [r (ts/area "tha-shape")]
     (is (= 9 r) "function return should be right.")
-    (is (=  [[:fn-call "clojure.test-clojure.storm-test-code.types" "area" ["tha-shape"] 1050802064]
+    (is (=  [[:fn-call "clojure.test-clojure.storm-test-code.types" "String.area" ["tha-shape"] 1050802064]
              [:bind "s" "tha-shape" ""]
              [:expr-exec "tha-shape" "3,2,1"]
              [:expr-exec 9 "3,2"]
@@ -40,7 +40,7 @@
   (let [tr (ts/->Triangle 2 5)
         r (ts/sides-count tr)]
     (is (= 3 r) "function return should be right.")
-    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "sides-count" [tr] -335308803]
+    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "Triangle.sides-count" [tr] -335308803]
             [:expr-exec 2 "3,2,2"]
             [:expr-exec 3 "3,2"]
             [:fn-return 3 ""]]
@@ -49,7 +49,7 @@
 (deftest extend-proto-basic-test
   (let [r (ts/area 10)]
     (is (= 100 r) "function return should be right.")
-    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "area" [10] -1332394678]
+    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "Long.area" [10] -1332394678]
             [:bind "n" 10 ""]
             [:expr-exec 10 "3,2,1"]
             [:expr-exec 10 "3,2,2"]
@@ -61,7 +61,7 @@
   (let [rect (ts/->Rectangle 2 4)
         r (ts/area rect)]
     (is (= 8 r) "function return should be right.")
-    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "area" [rect] 50784036]
+    (is (= [[:fn-call "clojure.test-clojure.storm-test-code.types" "Rectangle.area" [rect] 50784036]
             [:bind "r" rect ""]
             [:expr-exec rect "3,2,1,1"]
             [:bind "gclass" "clojure.test_clojure.storm_test_code.types.Rectangle" ""]