fixes after rebase

Author: d-kozak

substratevm/mx.substratevm/suite.py

@@ -407,7 +407,7 @@
             "dependencies": [
                 "com.oracle.graal.pointsto",
             ],
-            "checkstyle": "com.oracle.graal.pointsto",
+            "checkstyle": "com.oracle.svm.core",
             "javaCompliance": "11+",
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ReachabilityAnalysis.java

@@ -83,7 +83,7 @@ default boolean markFieldUnsafeAccessed(AnalysisField field) {
         if (!field.isUnsafeAccessed()) {
             /* Register the field as unsafe accessed. */
             field.registerAsAccessed();
-            field.registerAsUnsafeAccessed(getUniverse());
+            field.registerAsUnsafeAccessed();
             /* Force the update of registered unsafe loads and stores. */
             forceUnsafeUpdate(field);
             return true;
@@ -99,7 +99,7 @@ default void registerAsUnsafeAccessed(AnalysisField field, UnsafePartitionKind p
         if (!field.isUnsafeAccessed()) {
             /* Register the field as unsafe accessed. */
             field.registerAsAccessed();
-            field.registerAsUnsafeAccessed(getUniverse(), partitionKind);
+            field.registerAsUnsafeAccessed(partitionKind);
             /* Force the update of registered unsafe loads and stores. */
             forceUnsafeUpdate(field);
         }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

@@ -444,10 +444,6 @@ public boolean registerAsAllocated(Node node) {
 
     /** Register the type as instantiated with all its super types. */
     private void registerAsInstantiated(UsageKind usageKind) {
-        assert isAllocated.get() || isInHeap.get();
-        assert isArray() || (isInstanceClass() && !Modifier.isAbstract(getModifiers())) : this;
-        universe.hostVM.checkForbidden(this, usageKind);
-
         forAllSuperTypes(t -> t.instantiatedSubtypes.add(this));
     }
 

substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityObjectScanner.java

@@ -33,6 +33,7 @@
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 
+// todo resolve return values
 public class ReachabilityObjectScanner implements ObjectScanningObserver {
 
     private final ReachabilityAnalysis bb;
@@ -44,41 +45,52 @@ public ReachabilityObjectScanner(BigBang bb, AnalysisMetaAccess access) {
     }
 
     @Override
-    public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+    public boolean forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue, ObjectScanner.ScanReason reason) {
         field.registerAsAccessed();
         if (fieldValue.isNonNull() && fieldValue.getJavaKind() == JavaKind.Object) {
             // todo mark as instantiated
 // bb.markTypeInstantiated(constantType(bb, fieldValue));
         }
+        return true;
     }
 
     @Override
-    public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
+    public boolean forNullFieldValue(JavaConstant receiver, AnalysisField field, ObjectScanner.ScanReason reason) {
         if (receiver != null) {
             bb.markTypeReachable(constantType(receiver));
         }
         bb.markTypeReachable(field.getType());
 // System.out.println("Scanning field " + field);
+        return true;
     }
 
     @Override
-    public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+    public boolean forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue, ObjectScanner.ScanReason reason) {
         if (receiver != null) {
             bb.markTypeReachable(constantType(receiver));
         }
         bb.markTypeReachable(field.getType());
 // System.out.println("Scanning field " + field);
+        return true;
     }
 
     @Override
-    public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int elementIndex) {
+    public boolean forNullArrayElement(JavaConstant array, AnalysisType arrayType, int elementIndex, ObjectScanner.ScanReason reason) {
         bb.markTypeReachable(arrayType);
+        return true;
     }
 
     @Override
-    public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int elementIndex) {
+    public boolean forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int elementIndex, ObjectScanner.ScanReason reason) {
         bb.markTypeReachable(arrayType);
         bb.markTypeInstantiated(elementType);
+        return true;
+    }
+
+    @Override
+    public void forEmbeddedRoot(JavaConstant root, ObjectScanner.ScanReason reason) {
+        bb.markTypeReachable(constantType(root));
+        bb.markTypeInstantiated(constantType(root));
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java

@@ -381,15 +381,7 @@ public void registerAsUnsafeAccessed(Field field) {
         }
 
         public boolean registerAsUnsafeAccessed(AnalysisField aField) {
-            if (!aField.isUnsafeAccessed()) {
-                /* Register the field as unsafe accessed. */
-                aField.registerAsAccessed();
-                aField.registerAsUnsafeAccessed();
-                /* Force the update of registered unsafe loads and stores. */
-                bb.forceUnsafeUpdate(aField);
-                return true;
-            }
-            return false;
+            return bb.markFieldUnsafeAccessed(aField);
 // if (!field.isUnsafeAccessed()) {
 // /* Register the field as unsafe accessed. */
 // field.registerAsAccessed();
@@ -398,7 +390,7 @@ public boolean registerAsUnsafeAccessed(AnalysisField aField) {
 // bb.forceUnsafeUpdate(field);
 // return true;
 // }
-            return bb.markFieldUnsafeAccessed(aField);
+
         }
 
         public void registerAsFrozenUnsafeAccessed(Field field) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImageReachabilityAnalysis.java

@@ -66,7 +66,7 @@ public NativeImageReachabilityAnalysis(OptionValues options, AnalysisUniverse un
         super(options, universe, providers, universe.hostVM(), executor, heartbeatCallback, new SubstrateUnsupportedFeatures(), methodSummaryProvider);
         this.annotationSubstitutionProcessor = annotationSubstitutionProcessor;
         this.strengthenGraalGraphs = SubstrateOptions.parseOnce();
-        this.dynamicHubInitializer = new DynamicHubInitializer(universe, metaAccess, unsupportedFeatures, providers.getConstantReflection());
+        this.dynamicHubInitializer = new DynamicHubInitializer(metaAccess, unsupportedFeatures, providers.getConstantReflection());
     }
 
     @Override
@@ -112,7 +112,7 @@ public void checkUserLimitations() {
     private void scanHub(ObjectScanner objectScanner, AnalysisType type) {
         SVMHost svmHost = (SVMHost) hostVM;
         JavaConstant hubConstant = SubstrateObjectConstant.forObject(svmHost.dynamicHub(type));
-        objectScanner.scanConstant(hubConstant, ObjectScanner.ScanReason.HUB);
+        objectScanner.scanConstant(hubConstant, ObjectScanner.OtherReason.HUB);
     }
 
     private void handleUnknownValueField(AnalysisField field) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java

@@ -172,9 +172,6 @@
 import com.oracle.svm.hosted.phases.HostedGraphBuilderPhase;
 import com.oracle.svm.hosted.phases.ImageBuildStatisticsCounterPhase;
 import com.oracle.svm.hosted.phases.ImplicitAssertionsPhase;
-import com.oracle.svm.hosted.phases.StrengthenStampsPhase;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
-import com.oracle.svm.hosted.reporting.ProgressReporter.ReporterClosable;
 import com.oracle.svm.hosted.substitute.DeletedMethod;
 import com.oracle.svm.util.ImageBuildStatistics;