improve causality reporting for unresolved elements

(cherry picked from commit 77e3a57)
graalvm · Dec 20, 2024 · dcd9e5d · dcd9e5d
1 parent 98be8a1
commit dcd9e5d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java b/...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
@@ -242,6 +242,7 @@ protected Object loadReferenceTypeLock() {
 
         @Override
         protected void maybeEagerlyResolve(int cpi, int bytecode) {
+            lastUnresolvedElementException = null;
             try {
                 super.maybeEagerlyResolve(cpi, bytecode);
             } catch (UnresolvedElementException e) {
@@ -252,12 +253,19 @@ protected void maybeEagerlyResolve(int cpi, int bytecode) {
                      * ConstantPool.lookupType() which should return an UnresolvedJavaType which we
                      * know how to deal with.
                      */
+                    lastUnresolvedElementException = e;
                 } else {
                     throw e;
                 }
             }
         }
 
+        /**
+         * The type resolution error, if any, encountered in the last call to
+         * {@link #maybeEagerlyResolve}.
+         */
+        UnresolvedElementException lastUnresolvedElementException;
+
         @Override
         protected JavaType maybeEagerlyResolve(JavaType type, ResolvedJavaType accessingClass) {
             try {
@@ -541,7 +549,7 @@ private static Class<?>[] signatureToClasses(JavaMethod method) {
         }
 
         private void reportUnresolvedElement(String elementKind, String elementAsString) {
-            reportUnresolvedElement(elementKind, elementAsString, null);
+            reportUnresolvedElement(elementKind, elementAsString, lastUnresolvedElementException);
         }
 
         private void reportUnresolvedElement(String elementKind, String elementAsString, Throwable cause) {