loadBuiltinsPatches when parsing (first time only, and only after initialization)

Author: cosminbasca

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

@@ -241,7 +241,6 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         if (!pythonCore.isInitialized()) {
             pythonCore.initialize();
         }
-        pythonCore.loadBuiltinsPatches();
         context.getOrCreateMainModule(request.getSource().getPath());
 
         // if we are running the interpreter, module 'site' is automatically imported
@@ -294,7 +293,6 @@ private void parseAndCache(PythonContext context) {
 
             @TruffleBoundary
             private Object parseAndEval(PythonContext context, MaterializedFrame frame) {
-                context.getCore().loadBuiltinsPatches();
                 PNode fragment = parseInline(source, context, frame);
                 return fragment.execute(frame);
             }

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

@@ -362,9 +362,9 @@ public void initialize() {
     @Override
     public void loadBuiltinsPatches() {
         if (initialized && !builtinsPatchesLoaded) {
+            builtinsPatchesLoaded = true;
             String coreHome = PythonCore.getCoreHomeOrFail();
             loadFile(__BUILTINS_PATCHES__, coreHome);
-            builtinsPatchesLoaded = true;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java

@@ -213,6 +213,8 @@ private static PythonParseResult translateParseResult(PythonCore core, String na
     }
 
     private static PythonParseResult translateParseResult(PythonCore core, String name, ParserRuleContext input, Source source, Frame frame) {
+        // ensure builtins patches are loaded before parsing
+        core.loadBuiltinsPatches();
         TranslationEnvironment environment = new TranslationEnvironment(core.getLanguage());
         ScopeTranslator.accept(input, environment,
                         (env, trackCells) -> new ScopeTranslator<>(core, env, source.isInteractive(), trackCells),
@@ -223,6 +225,8 @@ private static PythonParseResult translateParseResult(PythonCore core, String na
     }
 
     private static PNode translateInlineParseResult(PythonCore core, String name, ParserRuleContext input, Source source, Frame currentFrame) {
+        // ensure builtins patches are loaded before parsing
+        core.loadBuiltinsPatches();
         TranslationEnvironment environment = new TranslationEnvironment(core.getLanguage());
         ScopeTranslator.accept(input, environment,
                         (env, trackCells) -> new InlineScopeTranslator<>(core, env, currentFrame.getFrameDescriptor(), trackCells),