Fix setting __bases__

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOModuleBuiltins.java

@@ -85,6 +85,7 @@
 import com.oracle.graal.python.builtins.modules.io.IONodes.IOMode;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -132,7 +133,8 @@ public void initialize(Python3Core core) {
         addBuiltinConstant("SEEK_END", SEEK_END);
         addBuiltinConstant("DEFAULT_BUFFER_SIZE", DEFAULT_BUFFER_SIZE);
         PythonBuiltinClass unsupportedOpExcType = core.lookupType(IOUnsupportedOperation);
-        unsupportedOpExcType.setSuperClass(core.lookupType(OSError), core.lookupType(ValueError));
+        PythonBuiltinClass osError = core.lookupType(OSError);
+        unsupportedOpExcType.setBases(osError, new PythonAbstractClass[]{osError, core.lookupType(ValueError)});
         addBuiltinConstant(IOUnsupportedOperation.getName(), unsupportedOpExcType);
         addBuiltinConstant(BlockingIOError.getName(), core.lookupType(BlockingIOError));
 

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

@@ -57,7 +57,7 @@
 import com.oracle.truffle.api.strings.TruffleString;
 
 public abstract class PythonManagedClass extends PythonObject implements PythonAbstractClass {
-    private final Object base;
+    @CompilationFinal private Object base;
     @CompilationFinal(dimensions = 1) private PythonAbstractClass[] baseClasses;
 
     @CompilationFinal private MroSequenceStorage methodResolutionOrder;
@@ -282,12 +282,13 @@ private void unsafeSetSuperClass(PythonAbstractClass... newBaseClasses) {
     }
 
     @TruffleBoundary
-    public final void setSuperClass(PythonAbstractClass... newBaseClasses) {
+    public final void setBases(Object newBaseClass, PythonAbstractClass[] newBaseClasses) {
         ArrayList<Set<PythonAbstractClass>> newBasesSubclasses = new ArrayList<>(newBaseClasses.length);
-        for (PythonAbstractClass newBase : newBaseClasses) {
-            newBasesSubclasses.add(GetSubclassesNode.executeUncached(newBase));
+        for (PythonAbstractClass type : newBaseClasses) {
+            newBasesSubclasses.add(GetSubclassesNode.executeUncached(type));
         }
 
+        Object oldBase = getBase();
         PythonAbstractClass[] oldBaseClasses = getBaseClasses();
         PythonAbstractClass[] oldMRO = (PythonAbstractClass[]) this.methodResolutionOrder.getInternalArray();
 
@@ -303,6 +304,7 @@ public final void setSuperClass(PythonAbstractClass... newBaseClasses) {
 
         try {
             // for what follows see also typeobject.c#type_set_bases()
+            this.base = newBaseClass;
             this.baseClasses = newBaseClasses;
             this.methodResolutionOrder.lookupChanged();
             this.setMRO(ComputeMroNode.doSlowPath(this));
@@ -342,6 +344,7 @@ public final void setSuperClass(PythonAbstractClass... newBaseClasses) {
                 // take no action if bases were replaced through reentrance
                 // revert only if set in this call
                 // e.g. the mro() call might have manipulated __bases__
+                this.base = oldBase;
                 this.baseClasses = oldBaseClasses;
             }
             this.methodResolutionOrder.lookupChanged();

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

@@ -868,7 +868,7 @@ Object setBases(VirtualFrame frame, PythonClass cls, PTuple value,
             Object oldBase = getBase.execute(inliningTarget, cls);
             checkCompatibleForAssigment.execute(frame, oldBase, newBestBase);
 
-            cls.setSuperClass(baseClasses);
+            cls.setBases(newBestBase, baseClasses);
             SpecialMethodSlot.reinitializeSpecialMethodSlots(cls, getLanguage());
 
             return PNone.NONE;