load builtin patches sooner

Author: timfel

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

@@ -288,7 +288,6 @@ public final class Python3Core implements PythonCore {
     private final PythonParser parser;
 
     @CompilationFinal private boolean initialized;
-    @CompilationFinal private boolean builtinsPatchesLoaded;
 
     // used in case PythonOptions.SharedCore is false
     @CompilationFinal private PythonContext singletonContext;
@@ -356,18 +355,10 @@ public void initialize() {
         }
         exportCInterface(getContext());
         currentException = null;
+        loadFile(__BUILTINS_PATCHES__, PythonCore.getCoreHomeOrFail());
         initialized = true;
     }
 
-    @Override
-    public void loadBuiltinsPatches() {
-        if (initialized && !builtinsPatchesLoaded) {
-            builtinsPatchesLoaded = true;
-            String coreHome = PythonCore.getCoreHomeOrFail();
-            loadFile(__BUILTINS_PATCHES__, coreHome);
-        }
-    }
-
     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/parser/PythonParserImpl.java

@@ -92,8 +92,6 @@ public Node parse(ParserMode mode, PythonCore core, Source source, Frame current
                 throw handleParserError(core, source, e);
             }
         }
-        // ensure builtins patches are loaded before parsing
-        core.loadBuiltinsPatches();
         TranslationEnvironment environment = new TranslationEnvironment(core.getLanguage());
         Node result;
         Consumer<TranslationEnvironment> environmentConsumer = (env) -> env.setFreeVarsInRootScope(currentFrame);

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

@@ -121,10 +121,6 @@ public interface PythonCore {
 
     public PythonContext getContext();
 
-    default void loadBuiltinsPatches() {
-
-    }
-
     static void writeWarning(TruffleLanguage.Env env, String warning) {
         if (!LIBPOLYGLOT || env.getOptions().get(PythonOptions.VerboseFlag)) {
             write(env, "WARNING: " + warning);