[GR-33173] Migrate to new context reference API - removing PythonLanguage.getCore()

ppisl · ppisl · commit ba8d12fec963 · 2021-09-07T21:42:48.000+02:00
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "61fd7e543d7aec3ee0f034e1405fe587056ee001" }
+{ "overlay": "352b1bc9f0e8a7806cb2135439f921a30b879d33" }
diff --git a/graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/Deserializing.java b/graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/Deserializing.java
@@ -76,7 +76,7 @@ public void setup() {
     public void execute(Blackhole bh) {
         for (int n = 0; n < parsingCycles; n++) {
             for (Item serialization : serializations) {
-                bh.consume(parser.deserialize(serialization.data));
+                bh.consume(parser.deserialize(core, serialization.data));
             }
         }
     }
@@ -89,7 +89,7 @@ private List<Item> createSerializations() {
                 PythonSSTNodeFactory sstFactory = new PythonSSTNodeFactory(core, source, parser);
                 PythonParserImpl.CacheItem item = parser.parseWithANTLR(PythonParser.ParserMode.File, 0, core, sstFactory, source, null, null);
                 SourceSection section = source.createSection(0, source.getLength());
-                result.add(new Item(PythonParserImpl.serialize(section, item.getAntlrResult(), item.getGlobalScope(), true)));
+                result.add(new Item(PythonParserImpl.serialize(core, section, item.getAntlrResult(), item.getGlobalScope(), true)));
             } catch (RuntimeException e) {
                 // do nothing
             }
diff --git a/graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/Serializing.java b/graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/Serializing.java
@@ -65,7 +65,7 @@ public void execute(Blackhole bh) {
         for (int n = 0; n < parsingCycles; n++) {
             for (PythonParserImpl.CacheItem item : ssts) {
                 SourceSection section = item.getSource().createSection(0, item.getSource().getLength());
-                bh.consume(PythonParserImpl.serialize(section, item.getAntlrResult(), item.getGlobalScope(), true));
+                bh.consume(PythonParserImpl.serialize(core, section, item.getAntlrResult(), item.getGlobalScope(), true));
             }
         }
     }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/SSTSerializationTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/SSTSerializationTests.java
@@ -1268,10 +1268,10 @@ public void checkSerialization(Source source) throws Exception {
         checkScopeSerialization(parserScope);
         Assert.assertNotNull("Parser result is null", parserResult);
         // serialize the source
-        byte[] serializeResult = serializer.serialize(parserResult);
+        byte[] serializeResult = serializer.serialize(context.getCore(), parserResult);
         Assert.assertNotNull("Serialized data are null", serializeResult);
         // and get the tree from serialized data
-        RootNode deserialize = serializer.deserialize(serializeResult);
+        RootNode deserialize = serializer.deserialize(context.getCore(), serializeResult);
 
         Assert.assertNotNull("Deserialized result is null", parserResult);
         // compare the tree from parser with the tree from serializer
@@ -1535,7 +1535,7 @@ public long[] getTimes(File file) throws Exception {
 
         PythonCodeSerializer serializer = context.getCore().getSerializer();
         startFile = System.nanoTime();
-        byte[] serializeResult = serializer.serialize(parserResult);
+        byte[] serializeResult = serializer.serialize(context.getCore(), parserResult);
         end = System.nanoTime();
         result[1] = end - startFile;
         TruffleFile serFile = context.getEnv().getInternalTruffleFile(file.getAbsolutePath() + ".pyc");
@@ -1550,7 +1550,7 @@ public long[] getTimes(File file) throws Exception {
         TruffleFile tFile = context.getEnv().getInternalTruffleFile(file.getAbsolutePath() + ".pyc");
         byte[] desbytes = tFile.readAllBytes();
         startMemory = System.nanoTime();
-        serializer.deserialize(desbytes);
+        serializer.deserialize(context.getCore(), desbytes);
         end = System.nanoTime();
         result[2] = end - startMemory;
         result[5] = end - startFile;
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/StringUtilsTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/StringUtilsTests.java
@@ -43,9 +43,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.parser.sst.StringUtils;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonParser.ErrorType;
 import com.oracle.graal.python.runtime.PythonParser.ParserErrorCallback;
 import com.oracle.truffle.api.nodes.Node;
@@ -78,8 +78,8 @@ public void warn(PythonBuiltinClassType type, String format, Object... args) {
         }
 
         @Override
-        public PythonLanguage getLanguage() {
-            return null;
+        public PythonContext getContext() {
+            return PythonContext.get(null);
         }
     };
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -386,7 +386,7 @@ protected CallTarget parse(ParsingRequest request) {
             if (bytes.length == 0) {
                 return createCachedCallTarget(l -> new BadOPCodeNode(l), BadOPCodeNode.class);
             }
-            return PythonUtils.getOrCreateCallTarget(core.getSerializer().deserialize(bytes));
+            return PythonUtils.getOrCreateCallTarget(core.getSerializer().deserialize(core, bytes));
         }
         for (int optimize = 0; optimize < MIME_TYPE_EVAL.length; optimize++) {
             if (MIME_TYPE_EVAL[optimize].equals(source.getMimeType())) {
@@ -608,10 +608,6 @@ public String getHome() {
         return getLanguageHome();
     }
 
-    public static Python3Core getCore() {
-        return PythonContext.get(null).getCore();
-    }
-
     /**
      * If this object can be cached in the AST.
      */
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -608,11 +608,11 @@ public Python3Core(PythonParser parser, boolean isNativeSupportAllowed) {
         this.coreFiles = initializeCoreFiles();
     }
 
-    @Override
     public PythonLanguage getLanguage() {
         return singletonContext.getLanguage();
     }
 
+    @Override
     public PythonContext getContext() {
         return singletonContext;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java
@@ -197,10 +197,10 @@ private static Object[] getTimeStruct(long seconds, boolean local) {
     }
 
     @TruffleBoundary
-    private static int[] getIntLocalTimeStruct(long seconds) {
+    private static int[] getIntLocalTimeStruct(PythonContext context, long seconds) {
         int[] timeStruct = new int[9];
         Instant instant = Instant.ofEpochSecond(seconds);
-        ZoneId zone = PythonContext.get(null).getEnv().getTimeZone();
+        ZoneId zone = context.getEnv().getTimeZone();
         ZonedDateTime zonedDateTime = LocalDateTime.ofInstant(instant, zone).atZone(zone);
         timeStruct[TM_YEAR] = zonedDateTime.getYear();
         timeStruct[TM_MON] = zonedDateTime.getMonth().ordinal() + 1; /* Want January == 1 */
@@ -870,7 +870,7 @@ public String formatTime(String format, @SuppressWarnings("unused") PNone time)
             if (format.indexOf(0) > -1) {
                 throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.EMBEDDED_NULL_CHARACTER);
             }
-            return format(format, getIntLocalTimeStruct((long) timeSeconds()));
+            return format(format, getIntLocalTimeStruct(PythonContext.get(this), (long) timeSeconds()));
         }
 
         @Specialization
@@ -932,7 +932,7 @@ public abstract static class CTimeNode extends PythonBuiltinNode {
         @Specialization
         public String localtime(VirtualFrame frame, Object seconds,
                         @Cached ToLongTime toLongTime) {
-            return format(getIntLocalTimeStruct(toLongTime.execute(frame, seconds)));
+            return format(getIntLocalTimeStruct(PythonContext.get(this), toLongTime.execute(frame, seconds)));
         }
 
         protected static String format(int[] tm) {
@@ -955,7 +955,7 @@ public abstract static class ASCTimeNode extends PythonBuiltinNode {
 
         @Specialization
         public String localtime(@SuppressWarnings("unused") PNone time) {
-            return format(getIntLocalTimeStruct((long) timeSeconds()));
+            return format(getIntLocalTimeStruct(PythonContext.get(this), (long) timeSeconds()));
         }
 
         @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java
@@ -564,7 +564,7 @@ private static void showWarning(Object filename, int lineno, Object text, Object
             } else {
                 name = polib.lookupAttribute(category, null, SpecialAttributeNames.__NAME__);
             }
-            Object stderr = PythonLanguage.getCore().getStderr();
+            Object stderr = PythonContext.get(polib).getCore().getStderr();
 
             // tfel: I've inlined PyFile_WriteObject, which just calls the "write" method and
             // decides if we should use "repr" or "str" - in this case its always "str" for objects
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/zlib/ZlibNodes.java
@@ -71,7 +71,6 @@
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
@@ -439,8 +438,8 @@ static void memError(Object zst, int function, int err, NFIZlibSupport zlibSuppo
 
         @SuppressWarnings("unused")
         @Fallback
-        static void fallback(Object zst, int function, int err, NFIZlibSupport zlibSupport, boolean deallocate) {
-            throw PythonLanguage.getCore().raise(SystemError, "Unhandled Error!");
+        void fallback(Object zst, int function, int err, NFIZlibSupport zlibSupport, boolean deallocate) {
+            throw PythonContext.get(this).getCore().raise(SystemError, "Unhandled Error!");
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java
@@ -1361,7 +1361,7 @@ static GraalHPyHandle doDebugObject(GraalHPyContext hpyContext, Object object,
         }
 
         Assumption noDebugModeAssumption() {
-            return PythonLanguage.get(null).noHPyDebugModeAssumption;
+            return PythonLanguage.get(this).noHPyDebugModeAssumption;
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java
@@ -121,7 +121,7 @@ private static PCode createCode(PythonLanguage language, PythonContext context,
             if (codedata.length == 0) {
                 ct = language.createCachedCallTarget(l -> new BadOPCodeNode(l, name), BadOPCodeNode.class, name);
             } else {
-                RootNode rootNode = context.getCore().getSerializer().deserialize(codedata, toStringArray(cellvars), toStringArray(freevars));
+                RootNode rootNode = context.getCore().getSerializer().deserialize(context.getCore(), codedata, toStringArray(cellvars), toStringArray(freevars));
                 ct = PythonUtils.getOrCreateCallTarget(rootNode);
                 if (filename != null) {
                     context.setCodeFilename(ct, filename);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PObjectSlice.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PObjectSlice.java
@@ -47,6 +47,7 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -135,7 +136,7 @@ public static SliceObjectInfo computeIndicesSlowPath(PObjectSlice slice, Object
         length = (BigInteger) lengthIn;
         if (pySign(length) < 0) {
             CompilerDirectives.transferToInterpreter();
-            throw PythonLanguage.getCore().raise(ValueError, ErrorMessages.LENGTH_SHOULD_NOT_BE_NEG);
+            throw PythonContext.get(factory).getCore().raise(ValueError, ErrorMessages.LENGTH_SHOULD_NOT_BE_NEG);
         }
         if (slice.getStep() == PNone.NONE) {
             step = ONE;
@@ -145,7 +146,7 @@ public static SliceObjectInfo computeIndicesSlowPath(PObjectSlice slice, Object
             stepIsNegative = pySign(step) < 0;
             if (pySign(step) == 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw PythonLanguage.getCore().raise(ValueError, ErrorMessages.SLICE_STEP_CANNOT_BE_ZERO);
+                throw PythonContext.get(factory).getCore().raise(ValueError, ErrorMessages.SLICE_STEP_CANNOT_BE_ZERO);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java
@@ -34,6 +34,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
@@ -103,7 +104,7 @@ public SliceInfo(int start, int stop, int step) {
     protected static void checkNegative(int length) {
         if (length < 0) {
             CompilerDirectives.transferToInterpreter();
-            throw PythonLanguage.getCore().raise(ValueError, ErrorMessages.LENGTH_SHOULD_NOT_BE_NEG);
+            throw PythonContext.get(null).getCore().raise(ValueError, ErrorMessages.LENGTH_SHOULD_NOT_BE_NEG);
         }
     }
 
@@ -135,7 +136,7 @@ public static SliceInfo computeIndices(Object startIn, Object stopIn, Object ste
             stepIsNegative = pySign(step) < 0;
             if (pySign(step) == 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw PythonLanguage.getCore().raise(ValueError, ErrorMessages.SLICE_STEP_CANNOT_BE_ZERO);
+                throw PythonContext.get(null).getCore().raise(ValueError, ErrorMessages.SLICE_STEP_CANNOT_BE_ZERO);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java
@@ -25,7 +25,6 @@
  */
 package com.oracle.graal.python.builtins.objects.str;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapperLibrary;
 import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
@@ -36,6 +35,7 @@
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.GilNode;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -273,7 +273,7 @@ public void setSequenceStorage(SequenceStorage store) {
     @SuppressWarnings({"static-method", "unused"})
     public static void setItem(int idx, Object value) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
-        PythonLanguage.getCore().raise(PythonBuiltinClassType.PString, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT);
+        PythonContext.get(null).getCore().raise(PythonBuiltinClassType.PString, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT);
     }
 
     @ExportMessage
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java
@@ -25,9 +25,9 @@
  */
 package com.oracle.graal.python.builtins.objects.tuple;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ObjectSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -119,7 +119,7 @@ public void setHash(long hash) {
     @SuppressWarnings({"static-method", "unused"})
     public static void setItem(int idx, Object value) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
-        PythonLanguage.getCore().raise(PythonBuiltinClassType.PTuple, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT);
+        PythonContext.get(null).getCore().raise(PythonBuiltinClassType.PTuple, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT);
     }
 
     @ExportMessage
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java
@@ -38,6 +38,7 @@
 import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.runtime.GilNode;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -69,7 +70,7 @@ public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinCla
     @Override
     public void setAttribute(Object name, Object value) {
         CompilerAsserts.neverPartOfCompilation();
-        if (name instanceof HiddenKey || !PythonLanguage.getCore().isInitialized()) {
+        if (name instanceof HiddenKey || !PythonContext.get(null).getCore().isInitialized()) {
             setAttributeUnsafe(name, value);
         } else {
             throw PRaiseNode.raiseUncached(null, TypeError, ErrorMessages.CANT_SET_ATTRIBUTES_OF_TYPE_S, this);
@@ -90,7 +91,7 @@ public final PythonBuiltinClassType getType() {
     @TruffleBoundary
     @Override
     public void onAttributeUpdate(String key, Object newValue) {
-        assert !PythonLanguage.getCore().isInitialized();
+        assert !PythonContext.get(null).getCore().isInitialized();
         // 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);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java
@@ -758,9 +758,9 @@ public static boolean validateSlots(Object klassIn) {
         if (initializingTypes.contains(klassIn)) {
             return true;
         }
-        final Python3Core core = PythonLanguage.getCore();
-        PythonLanguage language = core.getLanguage();
         ReadAttributeFromDynamicObjectNode uncachedReadAttrNode = ReadAttributeFromDynamicObjectNode.getUncached();
+        final Python3Core core = PythonContext.get(uncachedReadAttrNode).getCore();
+        PythonLanguage language = core.getLanguage();
         Object klass = klassIn;
         if (klass instanceof PythonBuiltinClassType) {
             PythonBuiltinClassType type = (PythonBuiltinClassType) klass;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java
@@ -419,16 +419,17 @@ static MroSequenceStorage doSlowPath(Object obj) {
             if (obj instanceof PythonManagedClass) {
                 return doPythonClass((PythonManagedClass) obj, ConditionProfile.getUncached(), ConditionProfile.getUncached(), PythonLanguage.get(null));
             } else if (obj instanceof PythonBuiltinClassType) {
-                return PythonLanguage.getCore().lookupType((PythonBuiltinClassType) obj).getMethodResolutionOrder();
+                return PythonContext.get(null).getCore().lookupType((PythonBuiltinClassType) obj).getMethodResolutionOrder();
             } else if (PGuards.isNativeClass(obj)) {
-                Object tupleObj = GetTypeMemberNode.getUncached().execute(obj, NativeMember.TP_MRO);
+                GetTypeMemberNode getTypeMemeberNode = GetTypeMemberNode.getUncached();
+                Object tupleObj = getTypeMemeberNode.execute(obj, NativeMember.TP_MRO);
                 if (tupleObj instanceof PTuple) {
                     SequenceStorage sequenceStorage = ((PTuple) tupleObj).getSequenceStorage();
                     if (sequenceStorage instanceof MroSequenceStorage) {
                         return (MroSequenceStorage) sequenceStorage;
                     }
                 }
-                throw PythonLanguage.getCore().raise(PythonBuiltinClassType.SystemError, ErrorMessages.INVALID_MRO_OBJ);
+                throw PythonContext.get(getTypeMemeberNode).getCore().raise(PythonBuiltinClassType.SystemError, ErrorMessages.INVALID_MRO_OBJ);
             }
             throw new IllegalStateException("unknown type " + obj.getClass().getName());
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRootNode.java
@@ -42,7 +42,6 @@
 
 import java.util.ArrayList;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.nodes.function.BuiltinFunctionRootNode;
@@ -215,7 +214,8 @@ public final byte[] getCode() {
     @TruffleBoundary
     private byte[] extractCode() {
         if (this instanceof PClosureRootNode) {
-            return PythonLanguage.getCore().getSerializer().serialize(this);
+            Python3Core core = PythonContext.get(this).getCore();
+            return core.getSerializer().serialize(core, this);
         }
         // no code for non-user functions
         return PythonUtils.EMPTY_BYTE_ARRAY;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonSSTNodeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonSSTNodeFactory.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FormatStringParser.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FormatStringParser.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/StringUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/StringUtils.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCodeSerializer.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCodeSerializer.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonParser.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonParser.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "61fd7e543d7aec3ee0f034e1405fe587056ee001" }`
	`1`	`+{ "overlay": "352b1bc9f0e8a7806cb2135439f921a30b879d33" }`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void setup() {`
`76`	`76`	`public void execute(Blackhole bh) {`
`77`	`77`	`for (int n = 0; n < parsingCycles; n++) {`
`78`	`78`	`for (Item serialization : serializations) {`
`79`		`- bh.consume(parser.deserialize(serialization.data));`
	`79`	`+ bh.consume(parser.deserialize(core, serialization.data));`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -89,7 +89,7 @@ private List<Item> createSerializations() {`
`89`	`89`	`PythonSSTNodeFactory sstFactory = new PythonSSTNodeFactory(core, source, parser);`
`90`	`90`	`PythonParserImpl.CacheItem item = parser.parseWithANTLR(PythonParser.ParserMode.File, 0, core, sstFactory, source, null, null);`
`91`	`91`	`SourceSection section = source.createSection(0, source.getLength());`
`92`		`- result.add(new Item(PythonParserImpl.serialize(section, item.getAntlrResult(), item.getGlobalScope(), true)));`
	`92`	`+ result.add(new Item(PythonParserImpl.serialize(core, section, item.getAntlrResult(), item.getGlobalScope(), true)));`
`93`	`93`	`} catch (RuntimeException e) {`
`94`	`94`	`// do nothing`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void execute(Blackhole bh) {`
`65`	`65`	`for (int n = 0; n < parsingCycles; n++) {`
`66`	`66`	`for (PythonParserImpl.CacheItem item : ssts) {`
`67`	`67`	`SourceSection section = item.getSource().createSection(0, item.getSource().getLength());`
`68`		`- bh.consume(PythonParserImpl.serialize(section, item.getAntlrResult(), item.getGlobalScope(), true));`
	`68`	`+ bh.consume(PythonParserImpl.serialize(core, section, item.getAntlrResult(), item.getGlobalScope(), true));`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ protected CallTarget parse(ParsingRequest request) {`
`386`	`386`	`if (bytes.length == 0) {`
`387`	`387`	`return createCachedCallTarget(l -> new BadOPCodeNode(l), BadOPCodeNode.class);`
`388`	`388`	`}`
`389`		`- return PythonUtils.getOrCreateCallTarget(core.getSerializer().deserialize(bytes));`
	`389`	`+ return PythonUtils.getOrCreateCallTarget(core.getSerializer().deserialize(core, bytes));`
`390`	`390`	`}`
`391`	`391`	`for (int optimize = 0; optimize < MIME_TYPE_EVAL.length; optimize++) {`
`392`	`392`	`if (MIME_TYPE_EVAL[optimize].equals(source.getMimeType())) {`
`@@ -608,10 +608,6 @@ public String getHome() {`
`608`	`608`	`return getLanguageHome();`
`609`	`609`	`}`
`610`	`610`
`611`		`- public static Python3Core getCore() {`
`612`		`- return PythonContext.get(null).getCore();`
`613`		`- }`
`614`		`-`
`615`	`611`	`/**`
`616`	`612`	`* If this object can be cached in the AST.`
`617`	`613`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -608,11 +608,11 @@ public Python3Core(PythonParser parser, boolean isNativeSupportAllowed) {`
`608`	`608`	`this.coreFiles = initializeCoreFiles();`
`609`	`609`	`}`
`610`	`610`
`611`		`- @Override`
`612`	`611`	`public PythonLanguage getLanguage() {`
`613`	`612`	`return singletonContext.getLanguage();`
`614`	`613`	`}`
`615`	`614`
	`615`	`+ @Override`
`616`	`616`	`public PythonContext getContext() {`
`617`	`617`	`return singletonContext;`
`618`	`618`	`}`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ private static void showWarning(Object filename, int lineno, Object text, Object`
`564`	`564`	`} else {`
`565`	`565`	`name = polib.lookupAttribute(category, null, SpecialAttributeNames.__NAME__);`
`566`	`566`	`}`
`567`		`- Object stderr = PythonLanguage.getCore().getStderr();`
	`567`	`+ Object stderr = PythonContext.get(polib).getCore().getStderr();`
`568`	`568`
`569`	`569`	`// tfel: I've inlined PyFile_WriteObject, which just calls the "write" method and`
`570`	`570`	`// decides if we should use "repr" or "str" - in this case its always "str" for objects`