allow more code sharing

Author: lukasstadler

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

@@ -282,9 +282,14 @@ public final class Python3Core implements PythonCore {
     @CompilationFinal(dimensions = 1) private PythonClass[] errorClasses;
     private final PythonParser parser;
 
-    @CompilationFinal private boolean initialized;
     @CompilationFinal private PythonContext singletonContext;
 
+    /*
+     * This field cannot be made CompilationFinal since code might get compiled during context
+     * initialization.
+     */
+    private boolean initialized;
+
     private final PythonObjectFactory factory = PythonObjectFactory.create();
 
     public Python3Core(PythonParser parser) {

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

@@ -2027,6 +2027,7 @@ Object call(PythonClass getSetClass, PNone set, PNone get, String name, PythonCl
         }
 
         @Fallback
+        @TruffleBoundary
         Object call(Object klsas, Object set, Object get, Object name, Object owner) {
             denyInstantiationAfterInitialization();
             throw new RuntimeException("error in creating getset_descriptor during core initialization");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -657,6 +657,7 @@ long doTpBasicsize(PythonBuiltinClass object, @SuppressWarnings("unused") String
         }
 
         @Specialization(guards = {"eq(TP_BASICSIZE, key)", "isPythonUserClass(object)"})
+        @TruffleBoundary
         long doTpBasicsize(PythonClass object, @SuppressWarnings("unused") String key, long basicsize) {
             // Do deliberately not use "SetAttributeNode" because we want to directly set the
             // attribute an bypass any user code.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -710,11 +710,6 @@ protected HashingStorage doDynamicObjectGeneralize(FastDictStorage storage, Stri
         @TruffleBoundary
         @Specialization(guards = {"!storage.getStore().getShape().isValid()"})
         protected HashingStorage doDynamicObjectUpdateShape(DynamicObjectStorage storage, String name, Object value) {
-            /*
-             * Slow path that we do not handle in compiled code. But no need to invalidate compiled
-             * code.
-             */
-            CompilerDirectives.transferToInterpreter();
             storage.getStore().updateShape();
             return doDynamicObjectUncached(storage, name, value);
         }

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

@@ -32,7 +32,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.function.Arity;
 import com.oracle.graal.python.builtins.objects.function.PythonCallable;
-import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.object.HiddenKey;
 
 /**
@@ -49,7 +49,7 @@ public PythonBuiltinClass(PythonBuiltinClassType builtinClass, PythonClass base)
 
     @Override
     public void setAttribute(Object name, Object value) {
-        CompilerDirectives.transferToInterpreter();
+        CompilerAsserts.neverPartOfCompilation();
         if (name instanceof HiddenKey || !PythonLanguage.getCore().isInitialized()) {
             setAttributeUnsafe(name, value);
         } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadGlobalOrBuiltinNode.java

@@ -32,6 +32,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
@@ -56,6 +57,7 @@ public abstract class ReadGlobalOrBuiltinNode extends ExpressionNode implements
     protected final String attributeId;
     protected final ConditionProfile isGlobalProfile = ConditionProfile.createBinaryProfile();
     protected final ConditionProfile isBuiltinProfile = ConditionProfile.createBinaryProfile();
+    protected final ConditionProfile isInitializedProfile = ConditionProfile.createBinaryProfile();
     @Child private HashingStorageNodes.GetItemNode getHashingItemNode;
     @Child private GetItemNode readFromDictNode;
 
@@ -115,13 +117,13 @@ private Object returnGlobalOrBuiltin(Object result) {
             }
             PythonContext context = getContext();
             PythonCore core = context.getCore();
-            Object builtin;
-            if (core.isInitialized()) {
-                builtin = readFromBuiltinsNode.execute(context.getBuiltins(), attributeId);
+            PythonModule builtins;
+            if (isInitializedProfile.profile(core.isInitialized())) {
+                builtins = context.getBuiltins();
             } else {
-                CompilerDirectives.transferToInterpreter();
-                builtin = readFromBuiltinsNode.execute(core.lookupBuiltinModule("builtins"), attributeId);
+                builtins = core.lookupBuiltinModule("builtins");
             }
+            Object builtin = readFromBuiltinsNode.execute(builtins, attributeId);
             if (isBuiltinProfile.profile(builtin != PNone.NO_VALUE)) {
                 return builtin;
             } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/BuiltinsLiteralNode.java

@@ -25,6 +25,9 @@
  */
 package com.oracle.graal.python.nodes.literal;
 
+import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
@@ -33,6 +36,12 @@ public final class BuiltinsLiteralNode extends LiteralNode {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        return getCore().isInitialized() ? getContext().getBuiltins() : getCore().lookupBuiltinModule("builtins");
+        return builtinsLiteral(getContext());
+    }
+
+    @TruffleBoundary
+    private static Object builtinsLiteral(PythonContext context) {
+        PythonCore core = context.getCore();
+        return core.isInitialized() ? context.getBuiltins() : core.lookupBuiltinModule("builtins");
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.object.GetDictNode;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.Tag;
 
@@ -83,6 +84,7 @@ private GetDictNode getGetDictNode() {
         return getDictNode;
     }
 
+    @TruffleBoundary
     protected Object importModule(String name, Object globals, String[] fromList, int level) {
         // Look up built-in modules supported by GraalPython
         if (!getCore().isInitialized()) {