[GR-61159] Use Env#isPreInitialization() instead of ImageInfo.inImageBuildtimeCode()

PullRequest: graalpython/3695

Author: eregon

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -411,7 +411,7 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
             }
         }
 
-        if (!ImageInfo.inImageCode()) {
+        if (!isAOT()) {
             for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
                 if (arg.equals("-ea")) {
                     addRelaunchArg("--vm.ea");
@@ -623,7 +623,7 @@ private String[] getExecutableList() {
         }
 
         // This should only be reached if this main is directly executed via Java.
-        if (!ImageInfo.inImageCode()) {
+        if (!isAOT()) {
             StringBuilder sb = new StringBuilder();
             ArrayList<String> exec_list = new ArrayList<>();
             sb.append(System.getProperty("java.home")).append(File.separator).append("bin").append(File.separator).append("java");

graalpython/com.oracle.graal.python.test/src/META-INF/services/com.oracle.graal.python.builtins.PythonBuiltins

@@ -53,7 +53,6 @@
 import java.util.logging.Level;
 
 import org.graalvm.home.Version;
-import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.options.OptionDescriptors;
 import org.graalvm.options.OptionKey;
 import org.graalvm.options.OptionValues;
@@ -385,8 +384,8 @@ public StructSequence.DescriptorCallTargets getOrCreateStructSequenceCallTargets
             return factory.apply(descriptor);
         }
         if (descriptor instanceof BuiltinTypeDescriptor builtinDescriptor) {
-            // There must be finite set of objects initialized at build time, no need for a weak map
-            assert !ImageInfo.inImageCode() || builtinDescriptor.wasInitializedAtBuildTime();
+            // There must be finite set of objects initialized in static final fields, no need for a
+            // weak map
             return structSequenceBuiltinTargets.computeIfAbsent(builtinDescriptor, factory);
         }
         return getOrCreateStructSeqNonBuiltinTargets(descriptor, factory);
@@ -498,6 +497,7 @@ protected boolean patchContext(PythonContext context, Env newEnv) {
             Python3Core.writeInfo("Cannot use preinitialized context.");
             return false;
         }
+        context.resetPerfCounter();
         context.initializeHomeAndPrefixPaths(newEnv, getLanguageHome());
         Python3Core.writeInfo("Using preinitialized context.");
         context.patch(newEnv);
@@ -989,7 +989,7 @@ public static Source newSource(PythonContext ctxt, TruffleFile src, String name)
     }
 
     private static Source newSource(PythonContext context, SourceBuilder srcBuilder) throws IOException {
-        if (getPythonOS() == PLATFORM_WIN32 && ImageInfo.inImageBuildtimeCode()) {
+        if (getPythonOS() == PLATFORM_WIN32 && context.getEnv().isPreInitialization()) {
             // canonicalization on windows means something else than on linux and causes issues
             // with paths
             srcBuilder.canonicalizePath(false);
@@ -1218,7 +1218,7 @@ protected void exitContext(PythonContext context, ExitMode exitMode, int exitCod
         if (context.getCApiContext() != null) {
             context.getCApiContext().exitCApiContext();
         }
-        if (!PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS && !ImageInfo.inImageBuildtimeCode()) {
+        if (!PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS && !context.getEnv().isPreInitialization()) {
             // Reset signal handlers back to what they were
             PythonModule signalModule = context.lookupBuiltinModule(T__SIGNAL);
             if (signalModule != null) {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advanced/CustomBuiltinsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -40,11 +40,7 @@
      */
     PythonOS os() default PythonOS.PLATFORM_ANY;
 
-    String publicName() default "";
-
     PythonBuiltinClassType[] extendClasses() default {};
 
-    String pythonFile() default "";
-
     boolean isEager() default false;
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advanced/CustomModule.java

@@ -56,11 +56,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.ServiceLoader;
 import java.util.logging.Level;
 
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.AbcModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ArrayModuleBuiltins;
@@ -393,8 +390,10 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleFile;
+import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
+import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.Source;
@@ -417,28 +416,15 @@ public abstract class Python3Core {
 
     private static TruffleString[] initializeCoreFiles() {
         // Order matters!
-        List<TruffleString> coreFiles = new ArrayList<>(Arrays.asList(
+        return new TruffleString[]{
                         toTruffleStringUncached("__graalpython__"),
                         toTruffleStringUncached("_weakref"),
                         toTruffleStringUncached("unicodedata"),
                         toTruffleStringUncached("_sre"),
                         toTruffleStringUncached("_sysconfig"),
                         toTruffleStringUncached("java"),
-                        toTruffleStringUncached("pip_hook")));
-        // add service loader defined python file extensions
-        if (!ImageInfo.inImageRuntimeCode()) {
-            ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
-            PythonOS currentOs = PythonOS.getPythonOS();
-            for (PythonBuiltins builtin : providers) {
-                CoreFunctions annotation = builtin.getClass().getAnnotation(CoreFunctions.class);
-                if (!annotation.pythonFile().isEmpty() &&
-                                (annotation.os() == PythonOS.PLATFORM_ANY || annotation.os() == currentOs)) {
-                    coreFiles.add(toTruffleStringUncached(annotation.pythonFile()));
-                }
-            }
-        }
-        coreFiles.removeAll(Arrays.asList(new TruffleString[]{null}));
-        return coreFiles.toArray(new TruffleString[coreFiles.size()]);
+                        toTruffleStringUncached("pip_hook")
+        };
     }
 
     private final PythonBuiltins[] builtins;
@@ -470,7 +456,7 @@ private static void filterBuiltins(List<PythonBuiltins> builtins) {
         builtins.removeAll(toRemove);
     }
 
-    private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed, boolean socketIOAllowed) {
+    private static PythonBuiltins[] initializeBuiltins(TruffleLanguage.Env env) {
         List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(new BuiltinConstructors(),
                         new AbcModuleBuiltins(),
                         new BuiltinFunctions(),
@@ -647,9 +633,9 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
                         new JSONModuleBuiltins(),
                         new SREModuleBuiltins(),
                         new AstModuleBuiltins(),
-                        PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SelectModuleBuiltins(),
-                        PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SocketModuleBuiltins(),
-                        PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SocketBuiltins(),
+                        PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !env.isSocketIOAllowed()) ? null : new SelectModuleBuiltins(),
+                        PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !env.isSocketIOAllowed()) ? null : new SocketModuleBuiltins(),
+                        PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !env.isSocketIOAllowed()) ? null : new SocketBuiltins(),
                         PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS ? null : new SignalModuleBuiltins(),
                         new TracebackBuiltins(),
                         new GcModuleBuiltins(),
@@ -803,15 +789,11 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
             builtins.add(new LsprofModuleBuiltins());
             builtins.add(LsprofModuleBuiltins.newProfilerBuiltins());
         }
-        if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES && (nativeAccessAllowed || ImageInfo.inImageBuildtimeCode())) {
+        if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES && (env.isNativeAccessAllowed() || env.isPreInitialization())) {
             builtins.add(new BZ2CompressorBuiltins());
             builtins.add(new BZ2DecompressorBuiltins());
             builtins.add(new BZ2ModuleBuiltins());
         }
-        ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
-        for (PythonBuiltins builtin : providers) {
-            builtins.add(builtin);
-        }
         filterBuiltins(builtins);
         return builtins.toArray(new PythonBuiltins[builtins.size()]);
     }
@@ -844,15 +826,15 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
 
     private final PythonLanguage language;
 
-    public Python3Core(PythonLanguage language, boolean isNativeSupportAllowed, boolean socketIOAllowed) {
+    public Python3Core(PythonLanguage language, TruffleLanguage.Env env) {
         this.language = language;
-        this.builtins = initializeBuiltins(isNativeSupportAllowed, socketIOAllowed);
+        this.builtins = initializeBuiltins(env);
         this.coreFiles = initializeCoreFiles();
     }
 
     @CompilerDirectives.ValueType
     public static class SysModuleState {
-        private int recursionLimit = ImageInfo.inImageCode() ? NATIVE_REC_LIM : REC_LIM;
+        private int recursionLimit = TruffleOptions.AOT ? NATIVE_REC_LIM : REC_LIM;
         private int checkInterval = 100;
         private double switchInterval = 0.005;
 
@@ -1040,10 +1022,10 @@ private void initializePython3Core(TruffleString coreHome) {
     /**
      * Run post-initialization code that needs a fully working Python environment. This will be run
      * eagerly when the context is initialized on the JVM or a new context is created on SVM, but is
-     * omitted when the native image is generated.
+     * omitted when creating a pre-initialized context.
      */
-    public final void postInitialize() {
-        if (!ImageInfo.inImageBuildtimeCode() || ImageInfo.inImageRuntimeCode()) {
+    public final void postInitialize(Env env) {
+        if (!env.isPreInitialization()) {
             initialized = false;
 
             for (PythonBuiltins builtin : builtins) {
@@ -1060,9 +1042,9 @@ public final void postInitialize() {
              * fallback to another _bz2 implementation (e.g. LLVM or maybe some Java lib). This
              * needs to be done here and cannot be done in 'initializeBuiltins' because then we
              * would never include the intrinsified _bz2 module in the native image since native
-             * access is never allowed during native image build time.
+             * access is never allowed during context pre-initialization.
              */
-            if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES && ImageInfo.inImageCode() && !getContext().isNativeAccessAllowed()) {
+            if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES && TruffleOptions.AOT && !getContext().isNativeAccessAllowed()) {
                 removeBuiltinModule(BuiltinNames.T_BZ2);
             }