move setting of the lazy python class into the object library

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -93,7 +93,6 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -145,7 +144,7 @@ LazyPythonClass setClass(@SuppressWarnings("unused") Object self, @SuppressWarni
 
         @Specialization
         PNone setClass(VirtualFrame frame, PythonObject self, PythonAbstractClass value,
-                        @Cached("singleContextAssumption()") Assumption singleContextAssumption,
+                        @CachedLibrary("self") PythonObjectLibrary lib,
                         @Cached("create()") BranchProfile errorValueBranch,
                         @Cached("create()") BranchProfile errorSelfBranch,
                         @Cached("create()") BranchProfile errorSlotsBranch,
@@ -167,7 +166,7 @@ PNone setClass(VirtualFrame frame, PythonObject self, PythonAbstractClass value,
                     throw raise(TypeError, "__class__ assignment: '%s' object layout differs from '%s'", getTypeName(value), getTypeName(lazyClass));
                 }
             }
-            self.setLazyPythonClass(value, singleContextAssumption);
+            lib.setLazyPythonClass(self, value);
             return PNone.NONE;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -43,6 +43,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.dsl.CachedLanguage;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.ExportLibrary;
@@ -86,7 +87,10 @@ public final PythonAbstractClass getPythonClass() {
         }
     }
 
-    public final void setLazyPythonClass(PythonAbstractClass cls, Assumption storingClassesInShapes) {
+    @ExportMessage
+    public final void setLazyPythonClass(PythonAbstractClass cls,
+                                         @SuppressWarnings("unused") @CachedLanguage PythonLanguage language,
+                                         @Cached("language.singleContextAssumption") Assumption storingClassesInShapes) {
         storedPythonClass = cls;
         if (storingClassesInShapes.isValid()) {
             PythonObjectLayoutImpl.INSTANCE.setLazyPythonClass(storage, cls);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.GenerateLibrary;
 import com.oracle.truffle.api.library.GenerateLibrary.Abstract;
@@ -65,6 +66,8 @@ public void setDict(PythonAbstractObject receiver, PHashingCollection dict) thro
         throw UnsupportedMessageException.create();
     }
 
+    public abstract void setLazyPythonClass(PythonAbstractObject receiver, LazyPythonClass cls);
+
     static final LibraryFactory<PythonObjectLibrary> FACTORY = LibraryFactory.resolve(PythonObjectLibrary.class);
 
     public static LibraryFactory<PythonObjectLibrary> getFactory() {