Fix interpreter metadata serialization.

Author: rakachan

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

@@ -116,13 +116,16 @@ public static InterpreterResolvedJavaField createAtBuildTime(AnalysisField origi
     }
 
     public static InterpreterResolvedJavaField createForInterpreter(String name, int modifiers,
-                    InterpreterResolvedJavaType type, InterpreterResolvedObjectType declaringClass,
+                    JavaType type, InterpreterResolvedObjectType declaringClass,
                     int offset,
-                    JavaConstant constant) {
+                    JavaConstant constant,
+                    boolean isWordStorage) {
         MetadataUtil.requireNonNull(type);
         MetadataUtil.requireNonNull(declaringClass);
         Symbol<Name> nameSymbol = SymbolsSupport.getNames().getOrCreate(name);
-        return new InterpreterResolvedJavaField(nameSymbol, type.getSymbolicType(), modifiers, type, declaringClass, offset, constant, type.isWordType());
+        InterpreterResolvedJavaType resolvedType = type instanceof InterpreterResolvedJavaType ? (InterpreterResolvedJavaType) type : null;
+        Symbol<Type> symbolicType = resolvedType == null ? CremaTypeAccess.jvmciNameToType(type.getName()) : resolvedType.getSymbolicType();
+        return new InterpreterResolvedJavaField(nameSymbol, symbolicType, modifiers, resolvedType, declaringClass, offset, constant, isWordStorage);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/serialization/Serializers.java

@@ -546,12 +546,13 @@ public static ValueSerializer<ReferenceConstant<?>> newReferenceConstantSerializ
     static final ValueSerializer<InterpreterResolvedJavaField> RESOLVED_FIELD = createSerializer(
                     (context, in) -> {
                         String name = context.readReference(in);
-                        InterpreterResolvedJavaType type = context.readReference(in);
+                        JavaType type = context.readReference(in);
                         InterpreterResolvedObjectType declaringClass = context.readReference(in);
                         int modifiers = LEB128.readUnsignedInt(in);
                         int offset = LEB128.readUnsignedInt(in);
                         JavaConstant constant = context.readReference(in);
-                        return InterpreterResolvedJavaField.createForInterpreter(name, modifiers, type, declaringClass, offset, constant);
+                        boolean isWordStorage = in.readBoolean();
+                        return InterpreterResolvedJavaField.createForInterpreter(name, modifiers, type, declaringClass, offset, constant, isWordStorage);
                     },
                     (context, out, value) -> {
                         context.writeReference(out, value.getName());
@@ -565,6 +566,7 @@ public static ValueSerializer<ReferenceConstant<?>> newReferenceConstantSerializ
                         } else {
                             context.writeReference(out, null);
                         }
+                        out.writeBoolean(value.isWordStorage());
                     });
 
     static final ValueSerializer<InterpreterResolvedObjectType> OBJECT_TYPE = createSerializer(