[GR-64551] Remove SpecialMethodSlot

PullRequest: graalpython/3771

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -6605,9 +6605,6 @@ PyType_Ready(PyTypeObject *type)
     type->tp_flags = (type->tp_flags & ~Py_TPFLAGS_READYING) | Py_TPFLAGS_READY;
     assert(_PyType_CheckConsistency(type));
 
-    // GraalPy change
-	GraalPyTruffle_InitializeOldStyleSlots(type);
-
 	// GraalPy change: for reason, see first call to Py_INCREF in this function
 	Py_DECREF(type);
     return 0;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -65,7 +65,6 @@
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.ellipsis.PEllipsis;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
-import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 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;
@@ -85,8 +84,8 @@
 import com.oracle.graal.python.nodes.HiddenAttr;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.bytecode_dsl.BytecodeDSLCodeUnit;
-import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
+import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.exception.TopLevelExceptionHandler;
 import com.oracle.graal.python.nodes.frame.GetFrameLocalsNode;
 import com.oracle.graal.python.nodes.frame.MaterializeFrameNode;
@@ -370,14 +369,6 @@ public boolean isSingleContext() {
      */
     private volatile boolean isLanguageInitialized;
 
-    /**
-     * A map to retrieve call targets of special slot methods for a given BuiltinMethodDescriptor.
-     * Used to perform uncached calls to slots. The call targets are not directly part of
-     * descriptors because that would make them specific to a language instance. We want to have
-     * them global in order to be able to efficiently compare them in guards.
-     */
-    private final ConcurrentHashMap<BuiltinMethodDescriptor, RootCallTarget> descriptorCallTargets = new ConcurrentHashMap<>();
-
     private final Shape emptyShape = Shape.newBuilder().allowImplicitCastIntToDouble(false).allowImplicitCastIntToLong(true).shapeFlags(0).propertyAssumptions(true).build();
     @CompilationFinal(dimensions = 1) private final Shape[] builtinTypeInstanceShapes = new Shape[PythonBuiltinClassType.VALUES.length];
 
@@ -1189,22 +1180,6 @@ private RootCallTarget createCachedCallTargetUnsafe(Function<PythonLanguage, Roo
         return createCachedCallTargetUnsafe(rootNodeFunction, Arrays.asList(cacheKeys), cacheInSingleContext);
     }
 
-    public void registerBuiltinDescriptorCallTarget(BuiltinMethodDescriptor descriptor, RootCallTarget callTarget) {
-        descriptorCallTargets.put(descriptor, callTarget);
-    }
-
-    /**
-     * Gets a {@link CallTarget} for given {@link BuiltinMethodDescriptor}. The
-     * {@link BuiltinMethodDescriptor} must have been inserted into the slots of some Python class
-     * in the current context, otherwise its {@link CallTarget} will not be cached here.
-     */
-    @TruffleBoundary
-    public RootCallTarget getDescriptorCallTarget(BuiltinMethodDescriptor descriptor) {
-        RootCallTarget callTarget = descriptorCallTargets.get(descriptor);
-        assert callTarget != null : "Missing call target for builtin slot descriptor " + descriptor;
-        return callTarget;
-    }
-
     @Override
     protected void exitContext(PythonContext context, ExitMode exitMode, int exitCode) {
         if (context.getCApiContext() != null) {

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

@@ -362,7 +362,6 @@
 import com.oracle.graal.python.builtins.objects.tuple.TupleGetterBuiltins;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
-import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.builtins.objects.type.TpSlots;
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.types.GenericAliasBuiltins;
@@ -920,14 +919,12 @@ public final void initialize(PythonContext context) {
         initializeImportlib();
         context.applyModuleOptions();
         initializePython3Core(context.getCoreHomeOrFail());
-        assert SpecialMethodSlot.checkSlotOverrides(this);
         initialized = true;
     }
 
     private void initializeJavaCore() {
         initializeTypes();
         populateBuiltins();
-        SpecialMethodSlot.initializeBuiltinsSpecialMethodSlots(this);
         publishBuiltinModules();
         builtinsModule = builtinModules.get(BuiltinNames.T_BUILTINS);
     }

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

@@ -176,7 +176,6 @@
 import com.oracle.graal.python.builtins.objects.foreign.ForeignObjectBuiltins;
 import com.oracle.graal.python.builtins.objects.frame.FrameBuiltins;
 import com.oracle.graal.python.builtins.objects.function.AbstractFunctionBuiltins;
-import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.function.FunctionBuiltins;
 import com.oracle.graal.python.builtins.objects.function.MethodDescriptorBuiltins;
 import com.oracle.graal.python.builtins.objects.function.WrapperDescriptorBuiltins;
@@ -261,7 +260,6 @@
 import com.oracle.graal.python.builtins.objects.tuple.StructSequenceBuiltins;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.builtins.objects.tuple.TupleGetterBuiltins;
-import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.builtins.objects.type.TpSlots;
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.types.GenericAliasBuiltins;
@@ -1246,15 +1244,6 @@ public TypeBuilder doc(String doc) {
     @CompilationFinal private PythonBuiltinClassType type;
     @CompilationFinal private int weaklistoffset;
 
-    /**
-     * Lookup cache for special slots defined in {@link SpecialMethodSlot}. Use
-     * {@link SpecialMethodSlot} to access the values. Unlike the cache in
-     * {@link com.oracle.graal.python.builtins.objects.type.PythonManagedClass}, this caches only
-     * builtin context independent values, most notably instances of {@link BuiltinMethodDescriptor}
-     * .
-     */
-    private Object[] specialMethodSlots;
-
     /**
      * The slots defined directly on the builtin class.
      */
@@ -1339,13 +1328,6 @@ public TruffleString getDoc() {
         return doc;
     }
 
-    /**
-     * Access the values using methods in {@link SpecialMethodSlot}.
-     */
-    public Object[] getSpecialMethodSlots() {
-        return specialMethodSlots;
-    }
-
     public TpSlots getSlots() {
         return slots;
     }
@@ -1354,11 +1336,6 @@ public TpSlots getDeclaredSlots() {
         return declaredSlots;
     }
 
-    public void setSpecialMethodSlots(Object[] slots) {
-        assert specialMethodSlots == null; // should be assigned only once per VM
-        specialMethodSlots = slots;
-    }
-
     public int getWeaklistoffset() {
         return weaklistoffset;
     }

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

@@ -99,6 +99,7 @@ static Object reconstructCached(VirtualFrame frame, Object arrayType, TruffleStr
                         @Exclusive @Cached PyObjectCallMethodObjArgs callDecode,
                         @Exclusive @Cached ArrayBuiltins.FromBytesNode fromBytesNode,
                         @Exclusive @Cached ArrayBuiltins.FromUnicodeNode fromUnicodeNode,
+                        @Exclusive @Cached TypeNodes.IsTypeNode isTypeNode,
                         @Exclusive @Cached IsSubtypeNode isSubtypeNode,
                         @Exclusive @Cached ArrayBuiltins.ByteSwapNode byteSwapNode,
                         @Exclusive @Cached TruffleString.CodePointLengthNode lengthNode,
@@ -109,7 +110,8 @@ static Object reconstructCached(VirtualFrame frame, Object arrayType, TruffleStr
             if (format == null) {
                 throw raiseNode.raise(inliningTarget, ValueError, ErrorMessages.BAD_TYPECODE);
             }
-            return doReconstruct(frame, inliningTarget, arrayType, typeCode, cachedCode, bytes, callDecode, fromBytesNode, fromUnicodeNode, isSubtypeNode, byteSwapNode, formatProfile.profile(format),
+            return doReconstruct(frame, inliningTarget, arrayType, typeCode, cachedCode, bytes, callDecode, fromBytesNode, fromUnicodeNode, isTypeNode, isSubtypeNode, byteSwapNode,
+                            formatProfile.profile(format),
                             getInstanceShape, raiseNode);
         }
 
@@ -119,6 +121,7 @@ static Object reconstruct(VirtualFrame frame, Object arrayType, TruffleString ty
                         @Exclusive @Cached PyObjectCallMethodObjArgs callDecode,
                         @Exclusive @Cached ArrayBuiltins.FromBytesNode fromBytesNode,
                         @Exclusive @Cached ArrayBuiltins.FromUnicodeNode fromUnicodeNode,
+                        @Exclusive @Cached TypeNodes.IsTypeNode isTypeNode,
                         @Exclusive @Cached IsSubtypeNode isSubtypeNode,
                         @Exclusive @Cached ArrayBuiltins.ByteSwapNode byteSwapNode,
                         @Exclusive @Cached TruffleString.CodePointLengthNode lengthNode,
@@ -129,15 +132,19 @@ static Object reconstruct(VirtualFrame frame, Object arrayType, TruffleString ty
             if (format == null) {
                 throw raiseNode.raise(inliningTarget, ValueError, ErrorMessages.BAD_TYPECODE);
             }
-            return doReconstruct(frame, inliningTarget, arrayType, typeCode, mformatCode, bytes, callDecode, fromBytesNode, fromUnicodeNode, isSubtypeNode, byteSwapNode, format, getInstanceShape,
+            return doReconstruct(frame, inliningTarget, arrayType, typeCode, mformatCode, bytes, callDecode, fromBytesNode, fromUnicodeNode, isTypeNode, isSubtypeNode, byteSwapNode, format,
+                            getInstanceShape,
                             raiseNode);
         }
 
         private static Object doReconstruct(VirtualFrame frame, Node inliningTarget, Object arrayType, TruffleString typeCode, int mformatCode, PBytes bytes, PyObjectCallMethodObjArgs callDecode,
-                        ArrayBuiltins.FromBytesNode fromBytesNode, ArrayBuiltins.FromUnicodeNode fromUnicodeNode, IsSubtypeNode isSubtypeNode,
+                        ArrayBuiltins.FromBytesNode fromBytesNode, ArrayBuiltins.FromUnicodeNode fromUnicodeNode, TypeNodes.IsTypeNode isTypeNode, IsSubtypeNode isSubtypeNode,
                         ArrayBuiltins.ByteSwapNode byteSwapNode, BufferFormat format,
                         TypeNodes.GetInstanceShape getInstanceShape, PRaiseNode raiseNode) {
-            if (!isSubtypeNode.execute(frame, arrayType, PythonBuiltinClassType.PArray)) {
+            if (!isTypeNode.execute(inliningTarget, arrayType)) {
+                throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.FIRST_ARGUMENT_MUST_BE_A_TYPE_OBJECT_NOT_P, arrayType);
+            }
+            if (!isSubtypeNode.execute(arrayType, PythonBuiltinClassType.PArray)) {
                 throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.N_NOT_SUBTYPE_OF_ARRAY, arrayType);
             }
             MachineFormat machineFormat = MachineFormat.fromCode(mformatCode);