[GR-52284] Improve runtime method call tracing.

PullRequest: graal/17068
oracle · Feb 24, 2024 · fa9d817 · fa9d817
2 parents adab8a8 + 478802a
commit fa9d817
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/CallTreeInfo.java b/...com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/CallTreeInfo.java
@@ -103,7 +103,7 @@ private void initializeCallerInfo() {
                      * the deopt method variant as a callee.
                      */
                     if (deoptInvokeTypeFlow || SubstrateCompilationDirectives.isRuntimeCompiledMethod(callee)) {
-                        MethodNode calleeMethodNode = analysisMethodMap.computeIfAbsent(callee, MethodNode::new);
+                        MethodNode calleeMethodNode = analysisMethodMap.computeIfAbsent(callee.getMultiMethod(RUNTIME_COMPILED_METHOD), MethodNode::new);
                         InvokeNode invoke = new InvokeNode(callerMethodNode, invokeInfo.getPosition());
                         calleeMethodNode.addCaller(invoke);
 

diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java
@@ -328,7 +328,6 @@ private boolean handleNeverPartOfCompilation(GraphBuilderContext b, ResolvedJava
                     callTree.add(cur.getMethod().format("%H.%n(%p)"));
                     cur = cur.outerFrameState();
                 }
-                callTree.removeLast(); // this method will be b.getMethod
                 neverPartOfCompilationViolations.add(Pair.create(b.getMethod(), String.join(",", callTree)));
             }
         }
@@ -822,8 +821,8 @@ private void checkBlockList(CallTreeInfo treeInfo) {
         if (neverPartOfCompilationViolations.size() > 0) {
             System.out.println("Error: CompilerAsserts.neverPartOfCompilation reachable for runtime compilation from " + neverPartOfCompilationViolations.size() + " places:");
             for (Pair<ResolvedJavaMethod, String> violation : neverPartOfCompilationViolations) {
-                System.out.println("called from");
-                System.out.println("(inlined call path): " + violation.getRight());
+                System.out.println("called from: " + violation.getRight());
+                System.out.println("runtime trace: ");
                 for (String item : runtimeCompilation.getCallTrace(treeInfo, (AnalysisMethod) violation.getLeft())) {
                     System.out.println(" " + item);
                 }