avoid loading builtin patches only during native image build time

Author: timfel

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

@@ -61,6 +61,7 @@
 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;
@@ -86,6 +87,7 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     public static final String MIME_TYPE = "text/x-python";
     public static final String EXTENSION = ".py";
 
+    @CompilationFinal private boolean nativeBuildTime = TruffleOptions.AOT;
     @CompilationFinal private PythonCore sharedCore;
     private final NodeFactory nodeFactory;
 
@@ -105,6 +107,7 @@ protected void finalizeContext(PythonContext context) {
 
     @Override
     protected boolean patchContext(PythonContext context, Env newEnv) {
+        nativeBuildTime = false; // now we're running
         ensureSysExecutable(context);
         ensureHomeInOptions(newEnv);
         if (!optionsAllowPreInitializedContext(context, newEnv)) {
@@ -115,6 +118,7 @@ protected boolean patchContext(PythonContext context, Env newEnv) {
         context.setOut(newEnv.out());
         context.setErr(newEnv.err());
         context.initialize();
+        context.getCore().postInitialize();
         return true;
     }
 
@@ -419,4 +423,8 @@ private static <E1 extends Exception, E2 extends Exception, E3 extends Exception
         }
         return newBuilder.build();
     }
+
+    public boolean isNativeBuildTime() {
+        return nativeBuildTime;
+    }
 }

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

@@ -346,6 +346,7 @@ public boolean isInitialized() {
         return initialized;
     }
 
+    @Override
     public void initialize() {
         String coreHome = PythonCore.getCoreHomeOrFail();
         loadFile("builtins", coreHome);
@@ -355,10 +356,19 @@ public void initialize() {
         }
         exportCInterface(getContext());
         currentException = null;
-        loadFile(__BUILTINS_PATCHES__, PythonCore.getCoreHomeOrFail());
+        postInitialize();
         initialized = true;
     }
 
+    @Override
+    public void postInitialize() {
+        if (!getLanguage().isNativeBuildTime()) {
+            initialized = false;
+            loadFile(__BUILTINS_PATCHES__, PythonCore.getCoreHomeOrFail());
+            initialized = true;
+        }
+    }
+
     public Object duplicate(Map<Object, Object> replacements, Object value) {
         Object replacement = replacements.get(value);
         if (replacement != null) {

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

@@ -67,6 +67,8 @@ public interface PythonCore {
      */
     public void initialize();
 
+    public void postInitialize();
+
     public boolean isInitialized();
 
     public PythonModule lookupBuiltinModule(String name);