Resolve review comments.

Author: tzezula

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/RuntimeCompilationFeature.java

@@ -237,7 +237,7 @@ enum InlineDecision {
     private Function<ConstantFieldProvider, ConstantFieldProvider> constantFieldProviderWrapper = Function.identity();
     private Consumer<CallTreeInfo> blocklistChecker = _ -> {
     };
-    private List<Runnable> afterInstallRuntimeConfig;
+    private final List<Runnable> afterInstallRuntimeConfigCallbacks = new ArrayList<>();
 
     public HostedProviders getHostedProviders() {
         return hostedProviders;
@@ -265,11 +265,8 @@ public void setUniverseFactory(SubstrateUniverseFactory universeFactory) {
      * instances.
      * </p>
      */
-    public synchronized void addAfterInstallRuntimeConfigCallback(Runnable callback) {
-        if (afterInstallRuntimeConfig == null) {
-            afterInstallRuntimeConfig = new ArrayList<>();
-        }
-        afterInstallRuntimeConfig.add(callback);
+    public void addAfterInstallRuntimeConfigCallback(Runnable callback) {
+        afterInstallRuntimeConfigCallbacks.add(callback);
     }
 
     @SuppressWarnings("unused")
@@ -455,15 +452,7 @@ public void beforeAnalysis(BeforeAnalysisAccess c) {
         BeforeAnalysisAccessImpl config = (BeforeAnalysisAccessImpl) c;
         installRuntimeConfig(config);
 
-        List<Runnable> callbacks;
-        synchronized (this) {
-            if (afterInstallRuntimeConfig != null) {
-                callbacks = List.copyOf(afterInstallRuntimeConfig);
-            } else {
-                callbacks = List.of();
-            }
-        }
-        for (Runnable callback : callbacks) {
+        for (Runnable callback : afterInstallRuntimeConfigCallbacks) {
             callback.run();
         }
 

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java

@@ -235,14 +235,6 @@ public boolean getAsBoolean() {
     private final Set<ResolvedJavaMethod> warnMethods;
     private final Set<Pair<ResolvedJavaMethod, String>> neverPartOfCompilationViolations;
     Set<AnalysisMethod> runtimeCompiledMethods;
-    /**
-     * Holds the {@link KnownTruffleTypes} instance, which is initialized lazily after
-     * {@link RuntimeCompilationFeature#beforeAnalysis(BeforeAnalysisAccess)} completes runtime
-     * configuration setup.
-     *
-     * @see RuntimeCompilationFeature#addAfterInstallRuntimeConfigCallback(Runnable)
-     */
-    private volatile KnownTruffleTypes types;
 
     public TruffleFeature() {
         blocklistMethods = new HashSet<>();
@@ -251,10 +243,6 @@ public TruffleFeature() {
         neverPartOfCompilationViolations = ConcurrentHashMap.newKeySet();
     }
 
-    public KnownTruffleTypes getTypes() {
-        return types;
-    }
-
     @Override
     public void registerForeignCalls(SubstrateForeignCallsProvider foreignCalls) {
         foreignCalls.register(SubstrateThreadLocalHandshake.FOREIGN_POLL);
@@ -307,9 +295,9 @@ public void afterRegistration(AfterRegistrationAccess access) {
         RuntimeCompilationFeature runtimeCompilationFeature = RuntimeCompilationFeature.singleton();
         runtimeCompilationFeature.addAfterInstallRuntimeConfigCallback(() -> {
             Providers providers = TruffleRuntimeCompilationSupport.getRuntimeConfig().getProviders();
-            types = new SubstrateKnownTruffleTypes(truffleRuntime, providers.getMetaAccess(), providers.getConstantReflection());
+            ImageSingletons.add(KnownTruffleTypes.class, new SubstrateKnownTruffleTypes(truffleRuntime, providers.getMetaAccess(), providers.getConstantReflection()));
         });
-        runtimeCompilationFeature.setUniverseFactory(new SubstrateTruffleUniverseFactory(truffleRuntime, this));
+        runtimeCompilationFeature.setUniverseFactory(new SubstrateTruffleUniverseFactory(truffleRuntime));
     }
 
     @Override
@@ -402,7 +390,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         truffleRuntime.initializeHostedKnownMethods(config.getUniverse().getOriginalMetaAccess());
 
         PartialEvaluator partialEvaluator = truffleCompiler.getPartialEvaluator();
-        registerKnownTruffleFields(config, types);
+        registerKnownTruffleFields(config, ImageSingletons.lookup(KnownTruffleTypes.class));
         GraphBuilderConfiguration graphBuilderConfig = partialEvaluator.getGraphBuilderConfigPrototype();
 
         TruffleAllowInliningPredicate allowInliningPredicate = new TruffleAllowInliningPredicate(runtimeCompilationFeature.getHostedProviders().getReplacements(),

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java

@@ -106,7 +106,7 @@ protected static TruffleCompilerConfiguration createSubstrateTruffleCompilerConf
         final GraphBuilderConfiguration.Plugins graphBuilderPlugins = runtimeCompilationFeature.getHostedProviders().getGraphBuilderPlugins();
         SubstrateBackend substrateBackend = TruffleRuntimeCompilationSupport.getRuntimeConfig().getBackendForNormalMethod();
         substrateBackend.setRuntimeToRuntimeInvokeMethod(optimizedCallTargetMethod);
-        KnownTruffleTypes types = ImageSingletons.lookup(TruffleFeature.class).getTypes();
+        KnownTruffleTypes types = ImageSingletons.lookup(KnownTruffleTypes.class);
         final TruffleTierConfiguration firstTier = new TruffleTierConfiguration(new EconomyPartialEvaluatorConfiguration(), substrateBackend,
                         TruffleRuntimeCompilationSupport.getFirstTierProviders(), TruffleRuntimeCompilationSupport.getFirstTierSuites(), TruffleRuntimeCompilationSupport.getFirstTierLirSuites(),
                         types);

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleUniverseFactory.java

@@ -31,7 +31,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.graal.meta.SubstrateType;
-import com.oracle.svm.truffle.TruffleFeature;
 import com.oracle.svm.util.OriginalClassProvider;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
@@ -62,16 +61,14 @@ public final class SubstrateTruffleUniverseFactory extends SubstrateUniverseFact
     private final SubstrateTruffleRuntime truffleRuntime;
     private final ConcurrentMap<PartialEvaluationMethodInfo, PartialEvaluationMethodInfo> canonicalMethodInfos = new ConcurrentHashMap<>();
     private final ConcurrentMap<ConstantFieldInfo, ConstantFieldInfo> canonicalFieldInfos = new ConcurrentHashMap<>();
-    private final TruffleFeature truffleFeature;
 
-    public SubstrateTruffleUniverseFactory(SubstrateTruffleRuntime truffleRuntime, TruffleFeature truffleFeature) {
+    public SubstrateTruffleUniverseFactory(SubstrateTruffleRuntime truffleRuntime) {
         this.truffleRuntime = truffleRuntime;
-        this.truffleFeature = truffleFeature;
     }
 
     @Override
     public SubstrateMethod createMethod(AnalysisMethod aMethod, ImageCodeInfo imageCodeInfo, HostedStringDeduplication stringTable) {
-        PartialEvaluationMethodInfo peInfo = createPartialEvaluationMethodInfo(truffleRuntime, aMethod, truffleFeature.getTypes());
+        PartialEvaluationMethodInfo peInfo = createPartialEvaluationMethodInfo(truffleRuntime, aMethod, ImageSingletons.lookup(KnownTruffleTypes.class));
         PartialEvaluationMethodInfo canonicalPeInfo = canonicalMethodInfos.computeIfAbsent(peInfo, k -> k);
         /*
          * A collection of all the flags that Truffle needs for partial evaluation. Most of this
@@ -86,7 +83,7 @@ public SubstrateMethod createMethod(AnalysisMethod aMethod, ImageCodeInfo imageC
     public SubstrateField createField(AnalysisField aField, HostedStringDeduplication stringTable) {
         SubstrateAnnotationExtractor extractor = (SubstrateAnnotationExtractor) ImageSingletons.lookup(AnnotationExtractor.class);
         Map<ResolvedJavaType, AnnotationValue> annotations = extractor.getDeclaredAnnotationValues(aField);
-        ConstantFieldInfo fieldInfo = PartialEvaluator.computeConstantFieldInfo(aField, annotations, truffleFeature.getTypes(), OriginalClassProvider::getOriginalType);
+        ConstantFieldInfo fieldInfo = PartialEvaluator.computeConstantFieldInfo(aField, annotations, ImageSingletons.lookup(KnownTruffleTypes.class), OriginalClassProvider::getOriginalType);
         ConstantFieldInfo canonicalFieldInfo = fieldInfo == null ? null : canonicalFieldInfos.computeIfAbsent(fieldInfo, k -> k);
         return new SubstrateTruffleField(aField, stringTable, canonicalFieldInfo);
     }
@@ -95,7 +92,7 @@ public SubstrateField createField(AnalysisField aField, HostedStringDeduplicatio
     public SubstrateType createType(AnalysisType analysisType, DynamicHub hub) {
         SubstrateAnnotationExtractor extractor = (SubstrateAnnotationExtractor) ImageSingletons.lookup(AnnotationExtractor.class);
         Map<ResolvedJavaType, AnnotationValue> annotations = extractor.getDeclaredAnnotationValues(analysisType);
-        boolean valueType = annotations.containsKey(OriginalClassProvider.getOriginalType(truffleFeature.getTypes().CompilerDirectives_ValueType));
+        boolean valueType = annotations.containsKey(OriginalClassProvider.getOriginalType(ImageSingletons.lookup(KnownTruffleTypes.class).CompilerDirectives_ValueType));
         return new SubstrateTruffleType(analysisType.getJavaKind(), hub, valueType);
     }