remove a few more caches of concrete classes that are invalid with shared ASTs

timfel · timfel · commit 44b7f6f79443 · 2018-08-10T11:28:30.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -727,14 +727,13 @@ protected CExtNodes.SubtypeNew createSubtypeNew() {
         // logic similar to float_subtype_new(PyTypeObject *type, PyObject *x) from CPython
         // floatobject.c we have to first create a temporary float, then fill it into
         // a natively allocated subtype structure
-        @Specialization(guards = "isSubtype.execute(cls, floatCls)", limit = "1")
+        @Specialization(guards = "isSubtype.execute(cls, getBuiltinFloatClass())", limit = "1")
         Object doPythonObject(PythonNativeClass cls, Object obj,
-                        @Cached("getBuiltinFloatClass()") PythonBuiltinClass floatCls,
                         @SuppressWarnings("unused") @Cached("create()") IsSubtypeNode isSubtype,
                         @Cached("create(__FLOAT__)") LookupAndCallUnaryNode callFloatNode,
                         @Cached("create()") BranchProfile gotException,
                         @Cached("createSubtypeNew()") CExtNodes.SubtypeNew subtypeNew) {
-            double realFloat = doubleFromObject(floatCls, obj, callFloatNode, gotException);
+            double realFloat = doubleFromObject(getBuiltinFloatClass(), obj, callFloatNode, gotException);
             return subtypeNew.execute(cls, realFloat);
         }
 
@@ -1627,13 +1626,12 @@ public PythonModule module(PythonClass cls, String name, String path) {
     @GenerateNodeFactory
     public abstract static class NotImplementedTypeNode extends PythonBuiltinNode {
         protected PythonClass getNotImplementedClass() {
-            return getCore().lookupType(PNotImplemented.class);
+            return getCore().lookupType(PythonBuiltinClassType.PNotImplemented);
         }
 
         @Specialization
-        public PNotImplemented module(Object cls,
-                        @Cached("getNotImplementedClass()") PythonClass notImplementedClass) {
-            if (cls != notImplementedClass) {
+        public PNotImplemented module(Object cls) {
+            if (cls != getNotImplementedClass()) {
                 throw raise(TypeError, "'NotImplementedType' object is not callable");
             } else {
                 return PNotImplemented.NOT_IMPLEMENTED;
@@ -1655,13 +1653,12 @@ public PEllipsis call(Object cls, Object args, Object kwds) {
     @GenerateNodeFactory
     public abstract static class NoneTypeNode extends PythonBuiltinNode {
         protected PythonClass getNoneClass() {
-            return getCore().lookupType(PNone.class);
+            return getCore().lookupType(PythonBuiltinClassType.PNone);
         }
 
         @Specialization
-        public PNone module(Object cls,
-                        @Cached("getNoneClass()") PythonClass noneClass) {
-            if (cls != noneClass) {
+        public PNone module(Object cls) {
+            if (cls != getNoneClass()) {
                 throw raise(TypeError, "NoneType.__new__(%s) is not a subtype of NoneType", cls);
             } else {
                 return PNone.NONE;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -56,6 +56,7 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.TruffleCextBuiltinsFactory.GetByteArrayNodeGen;
 import com.oracle.graal.python.builtins.modules.TruffleCextBuiltinsFactory.PNativeToPTypeNodeGen;
@@ -248,7 +249,7 @@ Object run(PythonNativeWrapper value,
         @Fallback
         Object runGeneric(Object value) {
             // TODO(fa) force primitive
-            return getIntNode().executeWith(getCore().lookupType(Integer.class), value, PNone.NONE);
+            return getIntNode().executeWith(getCore().lookupType(PythonBuiltinClassType.PInt), value, PNone.NONE);
         }
 
         private BuiltinConstructors.IntNode getIntNode() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesUtils.java
@@ -89,7 +89,7 @@ public static byte[] fromList(PythonCore core, PList list) {
                 } catch (ArithmeticException e) {
                 }
             } else {
-                throw core.raise(TypeError, "'%s' object cannot be interpreted as an integer", core.lookupType(item.getClass()));
+                throw core.raise(TypeError, "'%p' object cannot be interpreted as an integer", item);
             }
             throw core.raise(ValueError, "byte must be in range(0, 256)");
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
@@ -43,6 +43,7 @@
 import java.util.logging.Level;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
@@ -278,8 +279,10 @@ Object doTpAsNumber(PythonClass object, @SuppressWarnings("unused") String key)
 
         @Specialization(guards = "eq(TP_AS_BUFFER, key)")
         Object doTpAsBuffer(PythonClass object, @SuppressWarnings("unused") String key) {
-            if (object == getCore().lookupType(PBytes.class) || object == getCore().lookupType(PByteArray.class) || object == getCore().lookupType(PMemoryView.class) ||
-                            object == getCore().lookupType(PBuffer.class)) {
+            if (object == getCore().lookupType(PythonBuiltinClassType.PBytes) ||
+                            object == getCore().lookupType(PythonBuiltinClassType.PByteArray) ||
+                            object == getCore().lookupType(PythonBuiltinClassType.PMemoryView) ||
+                            object == getCore().lookupType(PythonBuiltinClassType.PBuffer)) {
                 return new PyBufferProcsWrapper(object);
             }
 
@@ -623,7 +626,7 @@ Object doTpDict(PythonClass object, @SuppressWarnings("unused") String key, Obje
                         @Cached("create()") HashingStorageNodes.GetItemNode getItem,
                         @Cached("create()") WriteAttributeToObjectNode writeAttrNode) {
             Object value = asPythonObjectNode.execute(nativeValue);
-            if (value instanceof PDict && ((PDict) value).getPythonClass() == getCore().lookupType(PDict.class)) {
+            if (value instanceof PDict && ((PDict) value).getPythonClass() == getCore().lookupType(PythonBuiltinClassType.PDict)) {
                 // special and fast case: commit items and change store
                 PDict d = (PDict) value;
                 for (Object k : d.keys()) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java
@@ -49,6 +49,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage.FastDictStorage;
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage.PythonObjectDictStorage;
@@ -361,7 +362,7 @@ public HashingStorage doSequence(PythonObject iterable, @SuppressWarnings("unuse
             Object it = getIterator.executeWith(iterable);
 
             ArrayList<PSequence> elements = new ArrayList<>();
-            PythonClass listClass = getCore().lookupType(PList.class);
+            PythonClass listClass = getCore().lookupType(PythonBuiltinClassType.PList);
             boolean isStringKey = false;
             try {
                 while (true) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java
@@ -50,6 +50,7 @@
 
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
@@ -89,14 +90,13 @@ Object repr(GetSetDescriptor descr) {
     @Builtin(name = __GET__, fixedNumOfArguments = 3)
     @GenerateNodeFactory
     abstract static class GetSetGetNode extends PythonTernaryBuiltinNode {
-        private PythonBuiltinClass noneClass;
         @Child CallUnaryMethodNode callNode = CallUnaryMethodNode.create();
         private final BranchProfile branchProfile = BranchProfile.create();
 
         // https://github.com/python/cpython/blob/e8b19656396381407ad91473af5da8b0d4346e88/Objects/descrobject.c#L149
         @Specialization
         Object get(GetSetDescriptor descr, Object obj, PythonClass type) {
-            if (descr_check(getCore(), descr, obj, type, getNoneType())) {
+            if (descr_check(getCore(), descr, obj, type, getCore().lookupType(PythonBuiltinClassType.PNone))) {
                 return descr;
             }
             if (descr.getGet() != null) {
@@ -106,14 +106,6 @@ Object get(GetSetDescriptor descr, Object obj, PythonClass type) {
                 throw raise(AttributeError, "attribute '%s' of '%s' objects is not readable", descr.getName(), descr.getType().getName());
             }
         }
-
-        private PythonBuiltinClass getNoneType() {
-            if (noneClass == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                noneClass = getCore().lookupType(PNone.class);
-            }
-            return noneClass;
-        }
     }
 
     @Builtin(name = __SET__, fixedNumOfArguments = 3)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java
@@ -296,10 +296,6 @@ public static boolean isString(Object obj) {
         return obj instanceof String || obj instanceof PString;
     }
 
-    public static PythonBuiltinClass getClassFor(Class<? extends PythonBuiltinObject> cls, PythonCore core) {
-        return core.lookupType(cls);
-    }
-
     public static boolean isBuiltinFunction(Object obj) {
         return obj instanceof PBuiltinFunction;
     }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static byte[] fromList(PythonCore core, PList list) {`
`89`	`89`	`} catch (ArithmeticException e) {`
`90`	`90`	`}`
`91`	`91`	`} else {`
`92`		`- throw core.raise(TypeError, "'%s' object cannot be interpreted as an integer", core.lookupType(item.getClass()));`
	`92`	`+ throw core.raise(TypeError, "'%p' object cannot be interpreted as an integer", item);`
`93`	`93`	`}`
`94`	`94`	`throw core.raise(ValueError, "byte must be in range(0, 256)");`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,10 +296,6 @@ public static boolean isString(Object obj) {`
`296`	`296`	`return obj instanceof String \|\| obj instanceof PString;`
`297`	`297`	`}`
`298`	`298`
`299`		`- public static PythonBuiltinClass getClassFor(Class<? extends PythonBuiltinObject> cls, PythonCore core) {`
`300`		`- return core.lookupType(cls);`
`301`		`- }`
`302`		`-`
`303`	`299`	`public static boolean isBuiltinFunction(Object obj) {`
`304`	`300`	`return obj instanceof PBuiltinFunction;`
`305`	`301`	`}`