fix InterpreterResolvedJAvaField.getType(), so it uses a registry lookup instead of a load

Author: rakachan

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/crema/CremaSupport.java

@@ -26,11 +26,11 @@
 
 import java.util.List;
 
-import com.oracle.svm.core.hub.DynamicHub;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
+import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.espresso.classfile.ParserKlass;
 
 import jdk.vm.ci.meta.JavaType;
@@ -67,6 +67,8 @@ interface CremaDispatchTable {
 
     Class<?> resolveOrNull(JavaType unresolvedJavaType, ResolvedJavaType accessingClass);
 
+    Class<?> findLoadedClass(JavaType unresolvedJavaType, ResolvedJavaType accessingClass);
+
     static CremaSupport singleton() {
         return ImageSingletons.lookup(CremaSupport.class);
     }

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

@@ -214,7 +214,7 @@ public final JavaType getType() {
         return resolvedType;
     }
 
-    public final InterpreterResolvedJavaType getResolvedType() {
+    public InterpreterResolvedJavaType getResolvedType() {
         if (resolvedType == null) {
             Class<?> cls = CremaSupport.singleton().resolveOrThrow(UnresolvedJavaType.create(typeSymbol.toString()), getDeclaringClass());
             resolvedType = (InterpreterResolvedJavaType) DynamicHub.fromClass(cls).getInterpreterType();

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/CremaSupportImpl.java

@@ -590,6 +590,14 @@ private static Class<?> loadClass(JavaType unresolvedJavaType, InterpreterResolv
         return registry.loadClass(symbolicType);
     }
 
+    @Override
+    public Class<?> findLoadedClass(JavaType unresolvedJavaType, ResolvedJavaType accessingClass) {
+        ByteSequence type = ByteSequence.create(unresolvedJavaType.getName());
+        Symbol<Type> symbolicType = SymbolsSupport.getTypes().getOrCreateValidType(type);
+        AbstractClassRegistry registry = ClassRegistries.singleton().getRegistry(((InterpreterResolvedJavaType) accessingClass).getJavaClass().getClassLoader());
+        return registry.findLoadedClass(symbolicType);
+    }
+
     @Override
     public Object execute(ResolvedJavaMethod targetMethod, Object[] args) {
         return Interpreter.execute((InterpreterResolvedJavaMethod) targetMethod, args);

substratevm/src/com.oracle.svm.jdwp.resident/src/com/oracle/svm/jdwp/resident/impl/ResidentJDWP.java

@@ -1802,7 +1802,7 @@ private static void sharedWriteField(Packet.Reader reader, Object typeOrReceiver
             case Object  -> {
                 assert !field.isWordStorage() : field; // handled above
                 Object value = readReferenceOrNull(reader);
-                if (value != null && !field.getType().getJavaClass().isInstance(value)) {
+                if (value != null && !field.getResolvedType().getJavaClass().isInstance(value)) {
                     throw JDWPException.raise(ErrorCode.TYPE_MISMATCH);
                 }
                 InterpreterToVM.setFieldObject(value, receiver, field);