Prevent CremaSupport from being reachable from DebuggerFeature.

Author: rakachan

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -93,7 +93,6 @@
 
 import com.oracle.svm.configure.ClassNameSupport;
 import com.oracle.svm.configure.config.SignatureUtil;
-
 import com.oracle.svm.core.AlwaysInline;
 import com.oracle.svm.core.BuildPhaseProvider.AfterHeapLayout;
 import com.oracle.svm.core.BuildPhaseProvider.AfterHostedUniverse;
@@ -483,7 +482,9 @@ public static DynamicHub allocate(String name, DynamicHub superHub, Object inter
                     int[] interfaceHashTableHeapArray,
                     int openTypeWorldInterfaceHashParam,
                     int vTableEntries,
-                    int[] declaredInstanceReferenceFieldOffsets, int afterFieldsOffset, boolean valueBased) {
+                    int[] declaredInstanceReferenceFieldOffsets,
+                    int afterFieldsOffset,
+                    boolean valueBased) {
         VMError.guarantee(RuntimeClassLoading.isSupported());
 
         ReferenceType referenceType = ReferenceType.computeReferenceType(DynamicHub.toClass(superHub));

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

@@ -24,9 +24,13 @@
  */
 package com.oracle.svm.interpreter.metadata;
 
+import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.crema.CremaResolvedJavaField;
+import com.oracle.svm.core.hub.crema.CremaSupport;
 import com.oracle.svm.espresso.classfile.ParserField;
 
+import jdk.vm.ci.meta.UnresolvedJavaType;
+
 public class CremaResolvedJavaFieldImpl extends InterpreterResolvedJavaField implements CremaResolvedJavaField {
     public static final CremaResolvedJavaFieldImpl[] EMPTY_ARRAY = new CremaResolvedJavaFieldImpl[0];
 
@@ -43,6 +47,14 @@ public static CremaResolvedJavaFieldImpl createAtRuntime(InterpreterResolvedObje
         return new CremaResolvedJavaFieldImpl(declaringClass, f, offset);
     }
 
+    public InterpreterResolvedJavaType getResolvedType() {
+        if (resolvedType == null) {
+            Class<?> cls = CremaSupport.singleton().resolveOrThrow(UnresolvedJavaType.create(getSymbolicType().toString()), getDeclaringClass());
+            resolvedType = (InterpreterResolvedJavaType) DynamicHub.fromClass(cls).getInterpreterType();
+        }
+        return resolvedType;
+    }
+
     @Override
     public boolean isTrustedFinal() {
         return isFinal() && (isStatic() || Record.class.isAssignableFrom(getDeclaringClass().getJavaClass()) /*- GR-69549: || getDeclaringClass().isHidden() */);

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

@@ -32,6 +32,7 @@
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.svm.core.hub.DynamicHub;
+import com.oracle.svm.core.hub.RuntimeClassLoading;
 import com.oracle.svm.core.hub.crema.CremaSupport;
 import com.oracle.svm.core.hub.registry.SymbolsSupport;
 import com.oracle.svm.core.util.VMError;
@@ -62,7 +63,7 @@ public class InterpreterResolvedJavaField implements ResolvedJavaField, CremaFie
     private int offset;
 
     private final InterpreterResolvedObjectType declaringClass;
-    private InterpreterResolvedJavaType resolvedType;
+    protected InterpreterResolvedJavaType resolvedType;
 
     private final boolean isWordStorage;
 
@@ -189,21 +190,28 @@ public final Symbol<Name> getSymbolicName() {
     }
 
     @Override
-    public final JavaType getType() {
+    public JavaType getType() {
         /*
          * For fields created at build-time, the type is set if it is available. We explicitly do
          * not want to trigger field type resolution at build-time.
          *
-         * If the resolvedType is null, the type was not included in the image. If we were to create
-         * a ResolvedJavaType for it, we would force it back in.
+         * If the resolvedType is null, the type was not included in the image. If we were to
+         * eagerly create a ResolvedJavaType for it, we would force it back in.
          */
         if (resolvedType == null) {
             UnresolvedJavaType unresolvedJavaType = UnresolvedJavaType.create(typeSymbol.toString());
+            Class<?> cls = null;
             /*
-             * This should not trigger actual class loading. Instead, we query the loader registry
-             * for an already loaded class.
+             * Prevent CremaSupport from being reached from other users of
+             * InterpreterResolvedJavaField.
              */
-            Class<?> cls = CremaSupport.singleton().findLoadedClass(unresolvedJavaType, getDeclaringClass());
+            if (RuntimeClassLoading.isSupported()) {
+                /*
+                 * This should not trigger actual class loading. Instead, we query the loader
+                 * registry for an already loaded class.
+                 */
+                cls = CremaSupport.singleton().findLoadedClass(unresolvedJavaType, getDeclaringClass());
+            }
             if (cls == null) {
                 // Not loaded: return the unresolved type
                 return unresolvedJavaType;
@@ -215,10 +223,6 @@ public final JavaType getType() {
     }
 
     public InterpreterResolvedJavaType getResolvedType() {
-        if (resolvedType == null) {
-            Class<?> cls = CremaSupport.singleton().resolveOrThrow(UnresolvedJavaType.create(typeSymbol.toString()), getDeclaringClass());
-            resolvedType = (InterpreterResolvedJavaType) DynamicHub.fromClass(cls).getInterpreterType();
-        }
         return resolvedType;
     }
 

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

@@ -1802,8 +1802,10 @@ 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.getResolvedType().getJavaClass().isInstance(value)) {
-                    throw JDWPException.raise(ErrorCode.TYPE_MISMATCH);
+                if (field.getResolvedType() != null) {
+                    if (value != null && !field.getResolvedType().getJavaClass().isInstance(value)) {
+                        throw JDWPException.raise(ErrorCode.TYPE_MISMATCH);
+                    }
                 }
                 InterpreterToVM.setFieldObject(value, receiver, field);
             }