Make calltrace calculation more resilient to null values.

oracle · Jan 22, 2024 · 3010d75 · 3010d75
1 parent abc1684
commit 3010d75
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 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
@@ -162,7 +162,7 @@ public void initialize(Set<AnalysisMethod> registeredRoots) {
                 for (AnalysisMethod callee : invokeInfo.getAllCallees()) {
                     if (SubstrateCompilationDirectives.isRuntimeCompiledMethod(callee)) {
                         MethodNode calleeMethodNode = analysisMethodMap.get(callee);
-                        if (calleeMethodNode.trace == null) {
+                        if (calleeMethodNode != null && calleeMethodNode.trace == null) {
                             /*
                              * If this was the first time this node was reached, then add to
                              * worklist.

diff --git a/...m.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/RuntimeCompilationFeature.java b/...m.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/RuntimeCompilationFeature.java
@@ -568,13 +568,11 @@ public void reportAnalysisError(AnalysisUniverse aUniverse, Throwable t) {
 
         checkMaxRuntimeCompiledMethods(treeInfo);
 
-        boolean foundError = false;
         if (t instanceof ParallelExecutionException exception) {
             for (var e : exception.getExceptions()) {
                 if (e instanceof AnalysisError.ParsingError parsingError) {
                     AnalysisMethod errorMethod = parsingError.getMethod();
                     if (errorMethod.isDeoptTarget() || SubstrateCompilationDirectives.isRuntimeCompiledMethod(errorMethod)) {
-                        foundError = true;
                         AnalysisMethod failingRuntimeMethod = null;
                         if (SubstrateCompilationDirectives.isRuntimeCompiledMethod(errorMethod)) {
                             failingRuntimeMethod = errorMethod;
@@ -593,10 +591,6 @@ public void reportAnalysisError(AnalysisUniverse aUniverse, Throwable t) {
                 }
             }
         }
-
-        if (foundError) {
-            throw VMError.shouldNotReachHere("Analysis failed while parsing deopt and/or runtime methods");
-        }
     }
 
     private class RuntimeCompilationParsingSupport implements SVMParsingSupport {