[GR-43476] [GR-43658] Reduce image build time.

PullRequest: graal/13570

Author: Christian Wimmer

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java

@@ -121,6 +121,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
                     "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidConcatDumpUsagePhase.run",
                     "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidDumpUsagePhase.run",
                     "org.graalvm.compiler.hotspot.SymbolicSnippetEncoder.verifySnippetEncodeDecode",
+                    "com.oracle.graal.pointsto.phases.InlineBeforeAnalysis.decodeGraph",
                     "org.graalvm.compiler.truffle.compiler.phases.inlining.CallTree.dumpBasic"));
 
     /**

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java

@@ -135,7 +135,7 @@ private PointsToAnalyzer(String mainEntryClass, OptionValues options) {
 
         JavaKind wordKind = JavaKind.fromWordSize(wordSize);
         AnalysisUniverse aUniverse = new AnalysisUniverse(standaloneHost, wordKind,
-                        analysisPolicy, SubstitutionProcessor.IDENTITY, originalMetaAccess, snippetReflection, snippetReflection, new PointsToAnalysisFactory(), null);
+                        analysisPolicy, SubstitutionProcessor.IDENTITY, originalMetaAccess, snippetReflection, new PointsToAnalysisFactory(), null);
         AnalysisMetaAccess aMetaAccess = new AnalysisMetaAccess(aUniverse, originalMetaAccess);
         StandaloneConstantReflectionProvider aConstantReflection = new StandaloneConstantReflectionProvider(aUniverse, HotSpotJVMCIRuntime.runtime());
         StandaloneConstantFieldProvider aConstantFieldProvider = new StandaloneConstantFieldProvider(aMetaAccess);

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java

@@ -182,7 +182,7 @@ private synchronized void linearizeGraph(boolean isRedo) {
                 int slotNum = flow.getSlot();
                 if (slotNum != -1) {
                     assert flow instanceof FormalParamTypeFlow || flow instanceof FormalReturnTypeFlow : "Unexpected flow " + flow;
-                    AnalysisError.guarantee(isRedo && flow.getSlot() == resultFlows.size(), "Flow already discovered: " + flow);
+                    AnalysisError.guarantee(isRedo && flow.getSlot() == resultFlows.size(), "Flow already discovered: %s", flow);
                 } else {
                     flow.setSlot(resultFlows.size());
                 }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java

@@ -158,7 +158,7 @@ public void ensureFlowsGraphCreated(PointsToAnalysis bb, InvokeTypeFlow reason)
     private synchronized void createFlowsGraph(PointsToAnalysis bb, InvokeTypeFlow reason) {
         if (flowsGraph == null) {
             AnalysisError.guarantee(reason == null || reason.getSource() == null ||
-                            !reason.getSource().getMethod().equals(method), "Parsing reason cannot be in the target method itself " + method.format("%H.%n"));
+                            !reason.getSource().getMethod().equals(method), "Parsing reason cannot be in the target method itself: %s", method);
 
             parsingReason = reason;
             try {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java

@@ -453,7 +453,7 @@ private void insertPlaceholderParamAndReturnFlows() {
                     AnalysisType paramType = (AnalysisType) paramTypes[index];
                     FormalParamTypeFlow parameter;
                     if (!isStatic && index == 0) {
-                        assert paramType == method.getDeclaringClass();
+                        assert paramType.equals(method.getDeclaringClass());
                         parameter = new FormalReceiverTypeFlow(position, paramType);
                     } else {
                         parameter = new FormalParamTypeFlow(position, paramType, index);

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

@@ -298,7 +298,7 @@ private void ensureTypeScanned(JavaConstant typeConstant, AnalysisType type, Sca
 
         @SuppressWarnings({"unchecked", "rawtypes"})
         private void ensureTypeScanned(JavaConstant value, JavaConstant typeConstant, AnalysisType type, ScanReason reason) {
-            AnalysisError.guarantee(type.isReachable(), "The heap snapshot verifier discovered a type not marked as reachable " + type.toJavaName());
+            AnalysisError.guarantee(type.isReachable(), "The heap snapshot verifier discovered a type not marked as reachable: %s", type);
             Object task = imageHeap.getTask(typeConstant);
             /* Make sure the DynamicHub value is scanned. */
             if (task == null) {

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

@@ -435,14 +435,14 @@ JavaConstant onFieldValueReachable(AnalysisField field, ImageHeapInstance receiv
     }
 
     JavaConstant onFieldValueReachable(AnalysisField field, ImageHeapInstance receiver, ValueSupplier<JavaConstant> rawValue, ScanReason reason, Consumer<ScanReason> onAnalysisModified) {
-        AnalysisError.guarantee(field.isReachable(), "Field value is only reachable when field is reachable " + field.format("%H.%n"));
+        AnalysisError.guarantee(field.isReachable(), "Field value is only reachable when field is reachable: %s", field);
 
         /*
          * Check if the field value is available. If not, trying to access it is an error. This
          * forces the callers to only trigger the execution of the future task when the value is
          * ready to be materialized.
          */
-        AnalysisError.guarantee(rawValue.isAvailable(), "Value not yet available for " + field.format("%H.%n"));
+        AnalysisError.guarantee(rawValue.isAvailable(), "Value not yet available for %s", field);
 
         JavaConstant transformedValue;
         try {
@@ -544,7 +544,7 @@ public boolean isValueAvailable(@SuppressWarnings("unused") AnalysisField field)
     @SuppressWarnings({"unchecked", "rawtypes"})
     private void snapshotFieldValue(AnalysisField field, Object fieldTask) {
         if (fieldTask instanceof AnalysisFuture<?>) {
-            AnalysisError.guarantee(field.isReachable(), "Field value snapshot computed for field not reachable " + field.format("%H.%n"));
+            AnalysisError.guarantee(field.isReachable(), "Field value snapshot computed for field not reachable: %s", field);
             postTask((AnalysisFuture<JavaConstant>) fieldTask);
         }
     }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/AnalysisConstantPool.java

@@ -27,10 +27,11 @@
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.JavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 public class AnalysisConstantPool extends WrappedConstantPool {
 
-    public AnalysisConstantPool(Universe universe, ConstantPool wrapped, WrappedJavaType defaultAccessingClass) {
+    public AnalysisConstantPool(Universe universe, ConstantPool wrapped, ResolvedJavaType defaultAccessingClass) {
         super(universe, wrapped, defaultAccessingClass);
     }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/OriginalClassProvider.java

@@ -24,17 +24,17 @@
  */
 package com.oracle.graal.pointsto.infrastructure;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 public interface OriginalClassProvider {
 
-    static Class<?> getJavaClass(SnippetReflectionProvider reflectionProvider, ResolvedJavaType javaType) {
+    static Class<?> getJavaClass(ResolvedJavaType javaType) {
         if (javaType instanceof OriginalClassProvider) {
             return ((OriginalClassProvider) javaType).getJavaClass();
         } else {
-            return reflectionProvider.originalClass(javaType);
+            return GraalAccess.getOriginalSnippetReflection().originalClass(javaType);
         }
     }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/OriginalFieldProvider.java

@@ -26,17 +26,17 @@
 
 import java.lang.reflect.Field;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 
 public interface OriginalFieldProvider {
 
-    static Field getJavaField(SnippetReflectionProvider reflectionProvider, ResolvedJavaField field) {
+    static Field getJavaField(ResolvedJavaField field) {
         if (field instanceof OriginalFieldProvider) {
             return ((OriginalFieldProvider) field).getJavaField();
         } else {
-            return reflectionProvider.originalField(field);
+            return GraalAccess.getOriginalSnippetReflection().originalField(field);
         }
     }