Remove PythonAbstractClass use from SuperBuiltins

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java

@@ -123,17 +123,17 @@ Object uncached(SuperObject self) {
     }
 
     abstract static class GetObjectTypeNode extends Node {
-        abstract PythonAbstractClass execute(SuperObject self);
+        abstract Object execute(SuperObject self);
 
         @Specialization(guards = "self == cachedSelf", assumptions = "cachedSelf.getNeverReinitializedAssumption()", limit = "1")
-        PythonAbstractClass cached(@SuppressWarnings("unused") SuperObject self,
+        Object cached(@SuppressWarnings("unused") SuperObject self,
                         @SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
-                        @Cached("self.getObjectType()") PythonAbstractClass type) {
+                        @Cached("self.getObjectType()") Object type) {
             return type;
         }
 
         @Specialization(replaces = "cached")
-        PythonAbstractClass uncached(SuperObject self) {
+        Object uncached(SuperObject self) {
             return self.getObjectType();
         }
     }
@@ -426,7 +426,7 @@ private Object genericGetAttr(VirtualFrame frame, Object object, Object attr) {
 
         @Specialization
         public Object get(VirtualFrame frame, SuperObject self, Object attr) {
-            PythonAbstractClass startType = getObjectType.execute(self);
+            Object startType = getObjectType.execute(self);
             if (startType == null) {
                 return genericGetAttr(frame, self, attr);
             }
@@ -499,7 +499,7 @@ private boolean isSameType(Object execute, PythonAbstractClass abstractPythonCla
             return isSameTypeNode.execute(execute, abstractPythonClass);
         }
 
-        private PythonAbstractClass[] getMro(PythonAbstractClass clazz) {
+        private PythonAbstractClass[] getMro(Object clazz) {
             if (getMroNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 getMroNode = insert(GetMroNode.create());
@@ -545,7 +545,7 @@ public abstract static class SelfClassNode extends PythonUnaryBuiltinNode {
 
         @Specialization
         Object getClass(SuperObject self) {
-            PythonAbstractClass objectType = getObjectType.execute(self);
+            Object objectType = getObjectType.execute(self);
             if (objectType == null) {
                 return PNone.NONE;
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperObject.java

@@ -41,15 +41,14 @@
 package com.oracle.graal.python.builtins.objects.superobject;
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
-import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.object.DynamicObject;
 
 public class SuperObject extends PythonBuiltinObject {
     private final Assumption neverReinitialized = Truffle.getRuntime().createAssumption("super object was never reinitialized");
     private Object type;
-    private PythonAbstractClass objecttype;
+    private Object objecttype;
     private Object object;
 
     public SuperObject(Object cls, DynamicObject storage) {
@@ -61,11 +60,11 @@ public void init(Object newType, Object newObjecttype, Object newObject) {
             neverReinitialized.invalidate();
         }
         this.type = newType;
-        this.objecttype = PythonAbstractClass.cast(newObjecttype);
+        this.objecttype = newObjecttype;
         this.object = newObject;
     }
 
-    public PythonAbstractClass getObjectType() {
+    public Object getObjectType() {
         return objecttype;
     }