[GR-25050] Pre-initialize engine in TruffleBaseFeature.beforeAnalysis().

PullRequest: graal/10539

Author: cstancu

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

@@ -147,11 +147,6 @@ public boolean getAsBoolean() {
         }
     }
 
-    /**
-     * True in the first analysis run where contexts are pre-initialized.
-     */
-    private boolean firstAnalysisRun;
-
     // Checkstyle: stop
     private ClassLoader imageClassLoader;
     private AnalysisMetaAccess metaAccess;
@@ -328,8 +323,13 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
                         LibraryFactory.class);
         config.registerSubtypeReachabilityHandler(TruffleBaseFeature::registerTruffleLibrariesAsInHeap,
                         LibraryExport.class);
+    }
 
-        firstAnalysisRun = true;
+    public static void preInitializeEngine() {
+        invokeStaticMethod("org.graalvm.polyglot.Engine$ImplHolder", "preInitializeEngine",
+                        Collections.emptyList());
+        invokeStaticMethod("com.oracle.truffle.api.impl.ThreadLocalHandshake", "resetNativeImageState",
+                        Collections.emptyList());
     }
 
     /**
@@ -349,15 +349,6 @@ private static void registerTruffleLibrariesAsInHeap(DuringAnalysisAccess access
     public void duringAnalysis(DuringAnalysisAccess access) {
         StaticObjectSupport.duringAnalysis(access);
 
-        if (firstAnalysisRun) {
-            firstAnalysisRun = false;
-            invokeStaticMethod("org.graalvm.polyglot.Engine$ImplHolder", "preInitializeEngine",
-                            Collections.emptyList());
-            invokeStaticMethod("com.oracle.truffle.api.impl.ThreadLocalHandshake", "resetNativeImageState",
-                            Collections.emptyList());
-            access.requireAnalysisIteration();
-        }
-
         for (Class<?> clazz : access.reachableSubtypes(com.oracle.truffle.api.nodes.Node.class)) {
             registerUnsafeAccess(access, clazz.asSubclass(com.oracle.truffle.api.nodes.Node.class));
 

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

@@ -363,6 +363,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
          * don't expect it to be used except for profiling enabled check.
          */
         TruffleBaseFeature.invokeStaticMethod("com.oracle.truffle.polyglot.PolyglotEngineImpl", "resetFallbackEngine", Collections.emptyList());
+        TruffleBaseFeature.preInitializeEngine();
     }
 
     static class TruffleParsingInlineInvokePlugin implements InlineInvokePlugin {

truffle/src/com.oracle.truffle.api.test/src/META-INF/native-image/native-image.properties

@@ -1,3 +1,4 @@
 Args = -H:Features=com.oracle.truffle.api.test.polyglot.RegisterTestClassesForReflectionFeature \
        -H:ReflectionConfigurationResources=com/oracle/truffle/api/test/polyglot/reflection.json \
-       -H:DynamicProxyConfigurationResources=com/oracle/truffle/api/test/polyglot/proxys.json
+       -H:DynamicProxyConfigurationResources=com/oracle/truffle/api/test/polyglot/proxys.json \
+       -Dpolyglot.image-build-time.PreinitializeContexts=ContextPreintializationNativeImageLanguage

truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationNativeImageTest.java

@@ -67,15 +67,20 @@
  *
  * This could potentially be improved using some white-box API that allows to explicitly store and
  * restore the preinitialized context.
+ *
+ * This test needs
+ * -Dpolyglot.image-build-time.PreinitializeContexts=ContextPreintializationNativeImageLanguage
+ * provided via com.oracle.truffle.api.test/src/META-INF/native-image/native-image.properties.
+ * Setting the property programmatically in a static initializer via
+ * System.setProperty("polyglot.image-build-time.PreinitializeContexts", LANGUAGE) is not reliable
+ * as its publishing depends on when the class is initialized. The property needs to be available
+ * before com.oracle.truffle.polyglot.PolyglotContextImpl#preInitialize() is invoked, i.e., before
+ * com.oracle.svm.truffle.TruffleBaseFeature#beforeAnalysis().
  */
 public class ContextPreInitializationNativeImageTest {
 
     static final String LANGUAGE = "ContextPreintializationNativeImageLanguage";
 
-    static {
-        System.setProperty("polyglot.image-build-time.PreinitializeContexts", LANGUAGE);
-    }
-
     @BeforeClass
     public static void runWithWeakEncapsulationOnly() {
         TruffleTestAssumptions.assumeWeakEncapsulation();