Ensure classloading for builtins happens at context initialize, not context create

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -460,7 +460,6 @@ protected boolean patchContext(PythonContext context, Env newEnv) {
     @Override
     protected PythonContext createContext(Env env) {
         final PythonContext context = new PythonContext(this, env);
-        context.initializeHomeAndPrefixPaths(env, getLanguageHome());
 
         Object[] engineOptionsUnroll = this.engineOptionsStorage;
         if (engineOptionsUnroll == null) {
@@ -476,13 +475,6 @@ protected PythonContext createContext(Env env) {
             assert areOptionsCompatible(options, PythonOptions.createEngineOptions(env)) : "invalid engine options";
         }
 
-        if (allocationReporter == null) {
-            allocationReporter = env.lookup(AllocationReporter.class);
-        } else {
-            // GR-61960
-            // assert allocationReporter == env.lookup(AllocationReporter.class);
-        }
-
         return context;
     }
 
@@ -509,8 +501,15 @@ protected OptionDescriptors getOptionDescriptors() {
     @Override
     protected void initializeContext(PythonContext context) {
         if (!isLanguageInitialized) {
+            if (allocationReporter == null) {
+                allocationReporter = context.getEnv().lookup(AllocationReporter.class);
+            } else {
+                // GR-61960
+                // assert allocationReporter == env.lookup(AllocationReporter.class);
+            }
             initializeLanguage();
         }
+        context.initializeHomeAndPrefixPaths(context.getEnv(), getLanguageHome());
         context.initialize();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -430,9 +430,8 @@ public abstract class Python3Core {
     private static final TruffleString T__FROZEN_IMPORTLIB_EXTERNAL = tsLiteral("_frozen_importlib_external");
     private static final TruffleString T__FROZEN_IMPORTLIB = tsLiteral("_frozen_importlib");
     private static final TruffleString T_IMPORTLIB_BOOTSTRAP = tsLiteral("importlib._bootstrap");
-    private final TruffleString[] coreFiles;
 
-    private static TruffleString[] initializeCoreFiles() {
+    private static TruffleString[] getCoreFiles() {
         // Order matters!
         List<TruffleString> coreFiles = List.of(
                         T___GRAALPYTHON__,
@@ -450,7 +449,7 @@ private static TruffleString[] initializeCoreFiles() {
         return coreFiles.toArray(new TruffleString[0]);
     }
 
-    private final PythonBuiltins[] builtins;
+    private PythonBuiltins[] builtins;
 
     public static final boolean HAS_PROFILER_TOOL;
     static {
@@ -865,8 +864,6 @@ private static PythonBuiltins[] initializeBuiltins(TruffleLanguage.Env env) {
 
     public Python3Core(PythonLanguage language, TruffleLanguage.Env env) {
         this.language = language;
-        this.builtins = initializeBuiltins(env);
-        this.coreFiles = initializeCoreFiles();
     }
 
     @CompilerDirectives.ValueType
@@ -944,6 +941,8 @@ public final boolean isCoreInitialized() {
      * Load the core library and prepare all builtin classes and modules.
      */
     public final void initialize(PythonContext context) {
+        assert this.builtins == null;
+        this.builtins = initializeBuiltins(context.getEnv());
         initializeJavaCore();
         initializeImportlib();
         context.applyModuleOptions();
@@ -1042,7 +1041,7 @@ private void initializeImportlib() {
     }
 
     private void initializePython3Core(TruffleString coreHome) {
-        for (TruffleString s : coreFiles) {
+        for (TruffleString s : getCoreFiles()) {
             loadFile(s, coreHome);
         }
         initialized = true;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -2730,9 +2730,12 @@ public Thread getMainThread() {
         return null;
     }
 
-    private int dlopenFlags = PosixConstants.RTLD_NOW.value;
+    private Integer dlopenFlags = null;
 
     public int getDlopenFlags() {
+        if (dlopenFlags == null) {
+            dlopenFlags = PosixConstants.RTLD_NOW.value;
+        }
         return dlopenFlags;
     }