Include sticky resolution exceptions in UnresolvedJava* entries e.g. getCause().

Author: mukel

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/InterpreterConstantPool.java

@@ -229,12 +229,6 @@ public Object resolvedAt(int cpi, InterpreterResolvedObjectType accessingClass)
             }
         }
 
-        assert !isUnresolved(entry);
-        if (entry instanceof Throwable throwable) {
-            // Cached exception.
-            throw uncheckedThrow(throwable);
-        }
-
         return entry;
     }
 
@@ -243,7 +237,7 @@ private static boolean isUnresolved(Object entry) {
     }
 
     @SuppressWarnings("unchecked")
-    private static <T extends Throwable> RuntimeException uncheckedThrow(Throwable t) throws T {
+    protected static <T extends Throwable> RuntimeException uncheckedThrow(Throwable t) throws T {
         throw (T) t;
     }
 

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/constantpool/RuntimeInterpreterConstantPool.java

@@ -87,6 +87,10 @@ private InterpreterResolvedJavaType resolveClassConstant(int classIndex, Interpr
             Symbol<Name> className = this.className(classIndex);
             type = SymbolsSupport.getTypes().fromClassNameEntry(className);
         } else if (entry instanceof UnresolvedJavaType unresolvedJavaType) {
+            Throwable cause = unresolvedJavaType.getCause();
+            if (cause != null) {
+                throw uncheckedThrow(cause);
+            }
             // CP comes from build-time JVMCI type, derive type from UnresolvedJavaType.
             type = SymbolsSupport.getTypes().getOrCreateValidType(unresolvedJavaType.getName());
         } else {
@@ -103,7 +107,7 @@ private InterpreterResolvedJavaType resolveClassConstant(int classIndex, Interpr
             // Just throw the exception and don't prevent these classes from being loaded for
             // virtual machine errors like StackOverflow and OutOfMemoryError, etc.
             // Needs clarification to section 5.4.3 of the JVM spec (see 6308271)
-            this.cachedEntries[classIndex] = e;
+            this.cachedEntries[classIndex] = UnresolvedJavaType.create(type.toString(), e);
             throw e;
         }
     }
@@ -126,6 +130,10 @@ private InterpreterResolvedJavaField resolveFieldRefConstant(int fieldIndex, Int
             int memberClassIndex = this.memberClassIndex(fieldIndex);
             holder = (InterpreterResolvedJavaType) resolvedAt(memberClassIndex, accessingClass);
         } else if (entry instanceof UnresolvedJavaField unresolvedJavaField) {
+            Throwable cause = unresolvedJavaField.getCause();
+            if (cause != null) {
+                throw uncheckedThrow(cause);
+            }
             // CP comes from build-time JVMCI type, derive it from UnresolvedJavaField.
             fieldName = SymbolsSupport.getNames().getOrCreate(unresolvedJavaField.getName());
             fieldType = SymbolsSupport.getTypes().getOrCreateValidType(unresolvedJavaField.getType().getName());
@@ -159,6 +167,10 @@ private InterpreterResolvedJavaMethod resolveClassMethodRefConstant(int methodIn
             int memberClassIndex = this.memberClassIndex(methodIndex);
             holder = (InterpreterResolvedJavaType) resolvedAt(memberClassIndex, accessingClass);
         } else if (entry instanceof UnresolvedJavaMethod unresolvedJavaMethod) {
+            Throwable cause = unresolvedJavaMethod.getCause();
+            if (cause != null) {
+                throw uncheckedThrow(cause);
+            }
             // CP comes from build-time JVMCI type, derive it from UnresolvedJavaMethod.
             methodName = SymbolsSupport.getNames().getOrCreate(unresolvedJavaMethod.getName());
             methodSignature = SymbolsSupport.getSignatures().getOrCreateValidSignature(unresolvedJavaMethod.getSignature().toMethodDescriptor());
@@ -193,6 +205,10 @@ private InterpreterResolvedJavaMethod resolveInterfaceMethodRefConstant(int inte
             int memberClassIndex = this.memberClassIndex(interfaceMethodIndex);
             holder = (InterpreterResolvedJavaType) resolvedAt(memberClassIndex, accessingClass);
         } else if (entry instanceof UnresolvedJavaMethod unresolvedJavaMethod) {
+            Throwable cause = unresolvedJavaMethod.getCause();
+            if (cause != null) {
+                throw uncheckedThrow(cause);
+            }
             // CP comes from build-time JVMCI type, derive it from UnresolvedJavaMethod.
             methodName = SymbolsSupport.getNames().getOrCreate(unresolvedJavaMethod.getName());
             methodSignature = SymbolsSupport.getSignatures().getOrCreateValidSignature(unresolvedJavaMethod.getSignature().toMethodDescriptor());