Embed Python3Core into PythonContext to avoid indirection

Author: steve-s

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

@@ -313,8 +313,7 @@ protected boolean patchContext(PythonContext context, Env newEnv) {
 
     @Override
     protected PythonContext createContext(Env env) {
-        Python3Core newCore = new Python3Core(new PythonParserImpl(env), env.isNativeAccessAllowed());
-        final PythonContext context = new PythonContext(this, env, newCore);
+        final PythonContext context = new PythonContext(this, env, new PythonParserImpl(env));
         context.initializeHomeAndPrefixPaths(env, getLanguageHome());
 
         Object[] engineOptionsUnroll = this.engineOptionsStorage;
@@ -391,7 +390,7 @@ protected CallTarget parse(ParsingRequest request) {
                     gil.release(context, wasAcquired);
                 }
             }
-            if (core.isInitialized()) {
+            if (core.isCoreInitialized()) {
                 return PythonUtils.getOrCreateCallTarget(new TopLevelExceptionHandler(this, root, source));
             } else {
                 return PythonUtils.getOrCreateCallTarget(root);
@@ -718,7 +717,7 @@ public static Source newSource(PythonContext ctxt, TruffleFile src, String name)
     }
 
     private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder) throws IOException {
-        boolean coreIsInitialized = ctxt.getCore().isInitialized();
+        boolean coreIsInitialized = ctxt.getCore().isCoreInitialized();
         boolean internal = !coreIsInitialized && !ctxt.getLanguage().getEngineOption(PythonOptions.ExposeInternalSources);
         if (internal) {
             srcBuilder.internal(true);

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

@@ -44,7 +44,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -265,6 +264,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.formatting.ErrorMessageFormatter;
 import com.oracle.graal.python.runtime.interop.PythonMapScope;
+import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CallTarget;
@@ -282,9 +282,10 @@
 
 /**
  * The core is intended to the immutable part of the interpreter, including most modules and most
- * types.
+ * types. The core is embedded, using inheritance, into {@link PythonContext} to avoid indirection
+ * through an extra field in the context.
  */
-public final class Python3Core implements ParserErrorCallback {
+public abstract class Python3Core implements ParserErrorCallback {
     private static final TruffleLogger LOGGER = PythonLanguage.getLogger(Python3Core.class);
     private final String[] coreFiles;
 
@@ -604,7 +605,6 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
 
     private final PythonParser parser;
 
-    @CompilationFinal private PythonContext singletonContext;
     @CompilationFinal private Object globalScopeObject;
 
     /*
@@ -613,43 +613,45 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
      */
     private volatile boolean initialized;
 
-    private PythonObjectSlowPathFactory objectFactory;
+    private final PythonLanguage language;
+    @CompilationFinal private PythonObjectSlowPathFactory objectFactory;
 
-    public Python3Core(PythonParser parser, boolean isNativeSupportAllowed) {
+    public Python3Core(PythonLanguage language, PythonParser parser, boolean isNativeSupportAllowed) {
+        this.language = language;
         this.parser = parser;
         this.builtins = initializeBuiltins(isNativeSupportAllowed);
         this.coreFiles = initializeCoreFiles();
     }
 
-    public PythonLanguage getLanguage() {
-        return singletonContext.getLanguage();
+    @Override
+    public final PythonContext getContext() {
+        // Small hack: we know that this is the only implementation of Python3Core
+        return (PythonContext) this;
     }
 
-    @Override
-    public PythonContext getContext() {
-        return singletonContext;
+    public final PythonLanguage getLanguage() {
+        return language;
     }
 
-    public PythonParser getParser() {
+    public final PythonParser getParser() {
         return parser;
     }
 
-    public PythonCodeSerializer getSerializer() {
+    public final PythonCodeSerializer getSerializer() {
         return (PythonCodeSerializer) parser;
     }
 
     /**
      * Checks whether the core is initialized.
      */
-    public boolean isInitialized() {
+    public final boolean isCoreInitialized() {
         return initialized;
     }
 
     /**
      * Load the core library and prepare all builtin classes and modules.
      */
-    public void initialize(PythonContext context) {
-        singletonContext = context;
+    public final void initialize(PythonContext context) {
         objectFactory = new PythonObjectSlowPathFactory(context.getAllocationReporter());
         initializeJavaCore();
         initializePython3Core(context.getCoreHomeOrFail());
@@ -678,7 +680,7 @@ private void initializePython3Core(String coreHome) {
      * 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.
      */
-    public void postInitialize() {
+    public final void postInitialize() {
         if (!ImageInfo.inImageBuildtimeCode() || ImageInfo.inImageRuntimeCode()) {
             initialized = false;
 
@@ -696,48 +698,48 @@ public void postInitialize() {
     }
 
     @TruffleBoundary
-    public PythonModule lookupBuiltinModule(String name) {
+    public final PythonModule lookupBuiltinModule(String name) {
         return builtinModules.get(name);
     }
 
-    public PythonBuiltinClass lookupType(PythonBuiltinClassType type) {
+    public final PythonBuiltinClass lookupType(PythonBuiltinClassType type) {
         assert builtinTypes[type.ordinal()] != null;
         return builtinTypes[type.ordinal()];
     }
 
     @TruffleBoundary
-    public String[] builtinModuleNames() {
+    public final String[] builtinModuleNames() {
         return builtinModules.keySet().toArray(PythonUtils.EMPTY_STRING_ARRAY);
     }
 
-    public PythonModule getBuiltins() {
+    public final PythonModule getBuiltins() {
         return builtinsModule;
     }
 
-    public PythonModule getSysModule() {
+    public final PythonModule getSysModule() {
         return sysModule;
     }
 
-    public PDict getSysModules() {
+    public final PDict getSysModules() {
         return sysModules;
     }
 
-    public PythonModule getImportlib() {
+    public final PythonModule getImportlib() {
         return importlib;
     }
 
-    public void registerImportlib(PythonModule mod) {
+    public final void registerImportlib(PythonModule mod) {
         if (importlib != null) {
             throw new IllegalStateException("importlib cannot be registered more than once");
         }
         importlib = mod;
     }
 
-    public PMethod getImportFunc() {
+    public final PMethod getImportFunc() {
         return importFunc;
     }
 
-    public void registerImportFunc(PMethod func) {
+    public final void registerImportFunc(PMethod func) {
         if (importFunc != null) {
             throw new IllegalStateException("__import__ func cannot be registered more than once");
         }
@@ -746,14 +748,14 @@ public void registerImportFunc(PMethod func) {
 
     @Override
     @TruffleBoundary
-    public void warn(PythonBuiltinClassType type, String format, Object... args) {
+    public final void warn(PythonBuiltinClassType type, String format, Object... args) {
         WarningsModuleBuiltins.WarnNode.getUncached().warnFormat(null, null, type, 1, format, args);
     }
 
     /**
      * Returns the stderr object or signals error when stderr is "lost".
      */
-    public Object getStderr() {
+    public final Object getStderr() {
         try {
             return PyObjectLookupAttr.getUncached().execute(null, sysModule, "stderr");
         } catch (PException e) {
@@ -933,29 +935,24 @@ private void loadFile(String s, String prefix) {
         GenericInvokeNode.getUncached().execute(callTarget, PArguments.withGlobals(mod));
     }
 
-    public PythonObjectSlowPathFactory factory() {
+    public final PythonObjectSlowPathFactory factory() {
         return objectFactory;
     }
 
-    public void setContext(PythonContext context) {
-        assert singletonContext == null;
-        singletonContext = context;
-    }
-
-    public PInt getTrue() {
+    public final PInt getTrue() {
         return pyTrue;
     }
 
-    public PInt getFalse() {
+    public final PInt getFalse() {
         return pyFalse;
     }
 
-    public PFloat getNaN() {
+    public final PFloat getNaN() {
         return pyNaN;
     }
 
     @Override
-    public RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Source source, SourceSection section, String message, Object... arguments) {
+    public final RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Source source, SourceSection section, String message, Object... arguments) {
         CompilerDirectives.transferToInterpreter();
         Node location = new Node() {
             @Override
@@ -968,7 +965,7 @@ public SourceSection getSourceSection() {
 
     @Override
     @TruffleBoundary
-    public RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Node location, String message, Object... arguments) {
+    public final RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Node location, String message, Object... arguments) {
         PBaseException instance;
         Object cls;
         switch (type) {
@@ -1017,15 +1014,15 @@ public RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Node loc
         throw PException.fromObject(instance, location, PythonOptions.isPExceptionWithJavaStacktrace(getLanguage()));
     }
 
-    public Object getTopScopeObject() {
+    public final Object getTopScopeObject() {
         return globalScopeObject;
     }
 
-    public static final void writeInfo(String message) {
+    public static void writeInfo(String message) {
         PythonLanguage.getLogger(Python3Core.class).fine(message);
     }
 
-    public static final void writeInfo(Supplier<String> messageSupplier) {
+    public static void writeInfo(Supplier<String> messageSupplier) {
         PythonLanguage.getLogger(Python3Core.class).fine(messageSupplier);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -3190,7 +3190,7 @@ Object doMissing(Object klass, PNone none) {
     abstract static class DescriptorNode extends PythonBuiltinNode {
         @TruffleBoundary
         protected final void denyInstantiationAfterInitialization(String name) {
-            if (getCore().isInitialized()) {
+            if (getCore().isCoreInitialized()) {
                 throw PRaiseNode.raiseUncached(this, TypeError, ErrorMessages.CANNOT_CREATE_INSTANCES, name);
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -818,7 +818,7 @@ PCode compile(String expression, String filename, String mode, int kwFlags, Obje
                     return PythonUtils.getOrCreateCallTarget((RootNode) getCore().getParser().parse(pm, kwOptimize, getCore(), source, null, null));
                 }
             };
-            if (getCore().isInitialized()) {
+            if (getCore().isCoreInitialized()) {
                 ct = createCode.get();
             } else {
                 ct = getCore().getLanguage().cacheCode(filename, createCode);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WeakRefModuleBuiltins.java

@@ -200,7 +200,7 @@ private ReferenceQueue<Object> getWeakReferenceQueue() {
                 ReferenceQueue<Object> queue = (ReferenceQueue<Object>) queueObject;
                 return queue;
             } else {
-                if (getContext().getCore().isInitialized()) {
+                if (getContext().getCore().isCoreInitialized()) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     throw new IllegalStateException("the weak reference queue was modified!");
                 } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

@@ -144,7 +144,7 @@ public static PCode createCode(PythonContext context, int flags, byte[] codedata
             };
 
             PythonObjectFactory factory = context.getCore().factory();
-            if (context.getCore().isInitialized() || isNotAModule) {
+            if (context.getCore().isCoreInitialized() || isNotAModule) {
                 return factory.createCode(createCode, flags, firstlineno, lnotab, filename);
             } else {
                 RootCallTarget ct = (RootCallTarget) language.cacheCode(filename, createCode);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java

@@ -69,7 +69,7 @@ public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinCla
     @Override
     public void setAttribute(Object name, Object value) {
         CompilerAsserts.neverPartOfCompilation();
-        if (name instanceof HiddenKey || !PythonContext.get(null).getCore().isInitialized()) {
+        if (name instanceof HiddenKey || !PythonContext.get(null).getCore().isCoreInitialized()) {
             setAttributeUnsafe(name, value);
         } else {
             throw PRaiseNode.raiseUncached(null, TypeError, ErrorMessages.CANT_SET_ATTRIBUTES_OF_TYPE_S, this);
@@ -90,7 +90,7 @@ public final PythonBuiltinClassType getType() {
     @TruffleBoundary
     @Override
     public void onAttributeUpdate(String key, Object newValue) {
-        assert !PythonContext.get(null).getCore().isInitialized();
+        assert !PythonContext.get(null).getCore().isCoreInitialized();
         // Ideally, startup code should not create ASTs that rely on assumptions of props of
         // builtins. So there should be no assumptions to invalidate yet
         assert !getMethodResolutionOrder().invalidateAttributeInMROFinalAssumptions(key);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java

@@ -154,7 +154,7 @@ public Object execute(VirtualFrame frame) {
     @TruffleBoundary
     private void checkInitialized() {
         Python3Core core = getContext().getCore();
-        if (core.isInitialized() && PythonLanguage.MIME_TYPE.equals(source.getMimeType())) {
+        if (core.isCoreInitialized() && PythonLanguage.MIME_TYPE.equals(source.getMimeType())) {
             getContext().initializeMainModule(source.getPath());
         }
     }