Replace our custom logic to detect native image build time with the ImageInfo API

Author: timfel

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

@@ -74,7 +74,6 @@
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLogger;
-import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.debug.DebuggerTags;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -107,7 +106,6 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
 
     public Assumption singleContextAssumption = Truffle.getRuntime().createAssumption("Only a single context is active");
 
-    @CompilationFinal private boolean nativeBuildTime = TruffleOptions.AOT;
     private final NodeFactory nodeFactory;
     public final ConcurrentHashMap<Class<? extends PythonBuiltinBaseNode>, RootCallTarget> builtinCallTargetCache = new ConcurrentHashMap<>();
 
@@ -130,7 +128,6 @@ protected void finalizeContext(PythonContext context) {
 
     @Override
     protected boolean patchContext(PythonContext context, Env newEnv) {
-        nativeBuildTime = false; // now we're running
         ensureHomeInOptions(newEnv);
         PythonCore.writeInfo("Using preinitialized context.");
         context.patch(newEnv);
@@ -458,10 +455,6 @@ private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder, St
         return newBuilder.build();
     }
 
-    public boolean isNativeBuildTime() {
-        return nativeBuildTime;
-    }
-
     @Override
     protected void initializeMultipleContexts() {
         super.initializeMultipleContexts();

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

@@ -42,6 +42,8 @@
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
+import org.graalvm.nativeimage.ImageInfo;
+
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.ArrayModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.AstModuleBuiltins;
@@ -144,6 +146,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleFile;
+import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.nodes.Node;
@@ -359,7 +362,7 @@ private void initializePythonCore() {
 
     @Override
     public void postInitialize() {
-        if (!getLanguage().isNativeBuildTime()) {
+        if (!TruffleOptions.AOT || ImageInfo.inImageRuntimeCode()) {
             initialized = false;
 
             loadFile(__BUILTINS_PATCHES__, PythonCore.getCoreHomeOrFail());

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

@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ProcessProperties;
 import org.graalvm.options.OptionValues;
 
@@ -52,7 +53,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 
 public final class PythonContext {
@@ -193,7 +193,7 @@ public void patch(Env newEnv) {
 
     private void setupRuntimeInformation() {
         PythonModule sysModule = core.initializeSysModule();
-        if (TruffleOptions.AOT && !language.isNativeBuildTime() && isExecutableAccessAllowed()) {
+        if (ImageInfo.inImageRuntimeCode() && isExecutableAccessAllowed()) {
             sysModule.setAttribute("executable", ProcessProperties.getExecutableName());
         }
         sysModules = (PDict) sysModule.getAttribute("modules");