Merge pull request #148 from bulasevich/GR-59858

[Backport] [GR-59858] Mark type of hidden field reachable.

Author: zakkak

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java

@@ -174,8 +174,15 @@ public TypeData computeTypeData(AnalysisType type) {
         return data;
     }
 
-    void markTypeInstantiated(AnalysisType type, ScanReason reason) {
+    void markTypeReachable(AnalysisType type, ScanReason reason) {
         if (universe.sealed() && !type.isReachable()) {
+            throw AnalysisError.typeNotFound(type);
+        }
+        type.registerAsReachable(reason);
+    }
+
+    void markTypeInstantiated(AnalysisType type, ScanReason reason) {
+        if (universe.sealed() && !type.isInstantiated()) {
             throw AnalysisError.shouldNotReachHere("Universe is sealed. New type reachable: " + type.toJavaName());
         }
         universe.getBigbang().registerTypeAsInHeap(type, reason);
@@ -254,7 +261,7 @@ protected ImageHeapConstant createImageHeapObject(JavaConstant constant, ScanRea
             newImageHeapConstant = createImageHeapInstance(constant, type, reason);
             AnalysisType typeFromClassConstant = (AnalysisType) constantReflection.asJavaType(constant);
             if (typeFromClassConstant != null) {
-                typeFromClassConstant.registerAsReachable(reason);
+                markTypeReachable(typeFromClassConstant, reason);
             }
         }
         return newImageHeapConstant;
@@ -277,7 +284,7 @@ private ImageHeapArray createImageHeapObjectArray(JavaConstant constant, Analysi
 
     private ImageHeapInstance createImageHeapInstance(JavaConstant constant, AnalysisType type, ScanReason reason) {
         /* We are about to query the type's fields, the type must be marked as reachable. */
-        type.registerAsReachable(reason);
+        markTypeReachable(type, reason);
         ResolvedJavaField[] instanceFields = type.getInstanceFields(true);
         ImageHeapInstance instance = new ImageHeapInstance(type, constant, instanceFields.length);
         for (ResolvedJavaField javaField : instanceFields) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -544,6 +544,7 @@ private void checkSubtypeForOverridingField(AnalysisField field, AnalysisType su
                 AnalysisField subclassField = (AnalysisField) javaField;
                 if (subclassField.getName().equals(field.getName())) {
                     hidingFields.add(subclassField);
+                    subclassField.getType().registerAsReachable("Is the declared type of a hiding Field used by reflection");
                 }
             }
         } catch (UnsupportedFeatureException | LinkageError e) {