Implement capsule destructors

msimacek · msimacek · commit 2c527a0447fb · 2024-04-22T09:41:35.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capsule.c b/graalpython/com.oracle.graal.python.cext/src/capsule.c
@@ -14,3 +14,7 @@ PyAPI_FUNC(PyTypeObject*) getPyCapsuleTypeReference() {
 	return &PyCapsule_Type;
 }
 
+PyAPI_FUNC(void) PyTruffleCapsule_CallDestructor(PyObject* capsule, PyCapsule_Destructor destructor) {
+    destructor(capsule);
+}
+
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCapsuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCapsuleBuiltins.java
@@ -93,7 +93,11 @@ static Object doGeneric(Object pointer, Object name, Object destructor,
                 throw raiseNode.get(inliningTarget).raise(ValueError, CALLED_WITH_INVALID_PY_CAPSULE_OBJECT);
             }
             Object n = interopLibrary.isNull(name) ? null : name;
-            return factory.createCapsule(pointer, n, destructor);
+            PyCapsule capsule = factory.createCapsule(pointer, n);
+            if (!interopLibrary.isNull(destructor)) {
+                capsule.registerDestructor(destructor);
+            }
+            return capsule;
         }
     }
 
@@ -305,11 +309,12 @@ abstract static class PyCapsule_SetDestructor extends CApiBinaryBuiltinNode {
         @Specialization
         static int doCapsule(PyCapsule o, Object destructor,
                         @Bind("this") Node inliningTarget,
+                        @CachedLibrary(limit = "1") InteropLibrary lib,
                         @Cached PRaiseNode.Lazy raiseNode) {
             if (o.getPointer() == null) {
                 throw raiseNode.get(inliningTarget).raise(ValueError, CALLED_WITH_INVALID_PY_CAPSULE_OBJECT, "PyCapsule_SetDestructor");
             }
-            o.setDestructor(destructor);
+            o.registerDestructor(lib.isNull(destructor) ? null : destructor);
             return 0;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsCNModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsCNModuleBuiltins.java
@@ -138,7 +138,7 @@ static Object getcodec(Object encoding,
                 throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
             }
 
-            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);
+            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);
             return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsHKModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsHKModuleBuiltins.java
@@ -130,7 +130,7 @@ static Object getcodec(Object encoding,
                 throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
             }
 
-            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);
+            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);
             return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsISO2022ModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsISO2022ModuleBuiltins.java
@@ -140,7 +140,7 @@ static Object getcodec(Object encoding,
                 throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
             }
 
-            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);
+            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);
             return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsJPModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsJPModuleBuiltins.java
@@ -162,7 +162,7 @@ static Object getcodec(Object encoding,
                 throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
             }
 
-            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);
+            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);
             return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsKRModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsKRModuleBuiltins.java
@@ -135,7 +135,7 @@ static Object getcodec(Object encoding,
                 throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
             }
 
-            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);
+            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);
             return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsTWModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsTWModuleBuiltins.java
@@ -130,7 +130,7 @@ static Object getcodec(Object encoding,
                 throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
             }
 
-            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);
+            PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);
             return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/MultibytecodecModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/MultibytecodecModuleBuiltins.java
@@ -113,7 +113,7 @@ protected static void registerCodec(String name, int cidx, CodecType ct, int mid
             if (midx != -1) {
                 DBCSMap h = maps[midx] = new DBCSMap(name, tsName, charset, mt);
                 codec.setAttribute(toTruffleStringUncached(h.charsetMapName),
-                                factory.createCapsule(h, PyMultibyteCodec_CAPSULE_NAME, null));
+                                factory.createCapsule(h, PyMultibyteCodec_CAPSULE_NAME));
             }
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CFieldBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CFieldBuiltins.java
@@ -753,7 +753,7 @@ static Object error(VirtualFrame frame, FieldSet setfunc, Pointer ptr, Object va
         private static TruffleString CTYPES_CFIELD_CAPSULE_NAME_PYMEM = tsLiteral("_ctypes/cfield.c pymem");
 
         private static PyCapsule createPyMemCapsule(Pointer pointer, PythonObjectFactory factory) {
-            PyCapsule capsule = factory.createCapsule(pointer, CTYPES_CFIELD_CAPSULE_NAME_PYMEM, null);
+            PyCapsule capsule = factory.createCapsule(pointer, CTYPES_CFIELD_CAPSULE_NAME_PYMEM);
             new PointerReference(capsule, pointer, PythonContext.get(factory).getSharedFinalizer());
             return capsule;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/capsule/PyCapsule.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/capsule/PyCapsule.java
@@ -44,6 +44,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FromCharPointerNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -54,66 +55,89 @@
 
 @ExportLibrary(InteropLibrary.class)
 public final class PyCapsule extends PythonBuiltinObject {
-    private Object pointer;
-    private Object name;
-    private Object context;
-    private Object destructor;
+    /*
+     * This class provides indirection to all the data members. Capsule destructors take the
+     * capsule, so we use this to recreate a temporary "resurrected" capsule for the destructor
+     * call.
+     */
+    public static class CapsuleData {
+        private Object pointer;
+        private Object name;
+        private Object context;
+        private Object destructor;
+
+        public CapsuleData(Object pointer, Object name) {
+            this.pointer = pointer;
+            this.name = name;
+        }
+
+        public Object getDestructor() {
+            return destructor;
+        }
+    }
+
+    private final CapsuleData data;
 
     /**
      * (mq) We are forcing all PyCapsule objects to be of a builtin type
      * PythonBuiltinClassType.Capsule. There are, currently, no possible way to extend PyCapsule, so
      * we can relax few checks elsewhere.
      */
-    public PyCapsule(PythonLanguage lang, Object pointer, Object name, Object destructor) {
+    public PyCapsule(PythonLanguage lang, CapsuleData data) {
         super(Capsule, Capsule.getInstanceShape(lang));
-        this.pointer = pointer;
-        this.name = name;
-        this.context = null;
-        this.destructor = destructor;
+        this.data = data;
+    }
+
+    public CapsuleData getData() {
+        return data;
     }
 
     public Object getPointer() {
-        return pointer;
+        return data.pointer;
     }
 
     public void setPointer(Object pointer) {
-        this.pointer = pointer;
+        data.pointer = pointer;
     }
 
     public Object getName() {
-        return name;
+        return data.name;
     }
 
     public void setName(Object name) {
-        this.name = name;
+        data.name = name;
     }
 
     public Object getContext() {
-        return context;
+        return data.context;
     }
 
     public void setContext(Object context) {
-        this.context = context;
+        data.context = context;
     }
 
     public Object getDestructor() {
-        return destructor;
+        return data.destructor;
     }
 
-    public void setDestructor(Object destructor) {
-        this.destructor = destructor;
+    public void registerDestructor(Object destructor) {
+        assert destructor == null || !InteropLibrary.getUncached().isNull(destructor);
+        if (data.destructor == null && destructor != null) {
+            CApiTransitions.registerPyCapsuleDestructor(this);
+        }
+        data.destructor = destructor;
     }
 
     @ExportMessage
     @TruffleBoundary
     public String toDisplayString(@SuppressWarnings("unused") boolean allowSideEffects) {
         String quote, n;
-        if (name != null) {
+        if (data.name != null) {
             quote = "\"";
-            if (name instanceof TruffleString) {
+            if (data.name instanceof TruffleString) {
                 n = ((TruffleString) getName()).toJavaStringUncached();
             } else {
-                n = CastToJavaStringNode.getUncached().execute(FromCharPointerNodeGen.getUncached().execute(name, false));
+                n = CastToJavaStringNode.getUncached().execute(FromCharPointerNodeGen.getUncached().execute(data.name, false));
             }
         } else {
             quote = "";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java
@@ -142,6 +142,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_TRUFFLE_ADD_SUBOFFSET("truffle_add_suboffset", Pointer, Pointer, Py_ssize_t, Py_ssize_t),
     FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT("PyTruffle_MemoryViewFromObject", PyObjectTransfer, PyObject, Int),
     FUN_PY_TRUFFLE_RELEASE_BUFFER("PyTruffle_ReleaseBuffer", ArgDescriptor.Void, Pointer),
+    FUN_PY_TRUFFLE_CAPSULE_CALL_DESTRUCTOR("PyTruffleCapsule_CallDestructor", ArgDescriptor.Void, PyObject, ArgDescriptor.PY_CAPSULE_DESTRUCTOR),
     FUN_PY_SEQUENCE_CHECK("PySequence_Check", Int, PyObject),
     FUN_PY_SEQUENCE_SIZE("PySequence_Size", Py_ssize_t, PyObject),
     FUN_PY_SEQUENCE_GET_ITEM("PySequence_GetItem", PyObjectTransfer, PyObject, Py_ssize_t),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyDateTimeCAPIWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyDateTimeCAPIWrapper.java
@@ -118,7 +118,7 @@ public static PyCapsule initWrapper(PythonContext context, CApiContext capiConte
 
         Object pointerObject = allocatePyDatetimeCAPI(datetimeModule);
 
-        PyCapsule capsule = context.factory().createCapsule(pointerObject, T_PYDATETIME_CAPSULE_NAME, null);
+        PyCapsule capsule = context.factory().createCapsule(pointerObject, T_PYDATETIME_CAPSULE_NAME);
         PyObjectSetAttr.executeUncached(datetimeModule, T_DATETIME_CAPI, capsule);
         assert PyObjectGetAttr.executeUncached(datetimeModule, T_DATETIME_CAPI) != context.getNativeNull();
         return capsule;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java
@@ -56,6 +56,7 @@
 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.capsule.PyCapsule;
 import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiGuards;
@@ -95,6 +96,7 @@
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage.StorageType;
@@ -165,6 +167,7 @@ public HandleContext(boolean useShadowTable) {
         public final HandleStack nativeStubLookupFreeStack;
 
         public final Set<NativeStorageReference> nativeStorageReferences = new HashSet<>();
+        public final Set<PyCapsuleReference> pyCapsuleReferences = new HashSet<>();
 
         public final ReferenceQueue<Object> referenceQueue = new ReferenceQueue<>();
 
@@ -355,6 +358,32 @@ public static void registerNativeSequenceStorage(NativeSequenceStorage storage)
         handleContext.nativeStorageReferences.add(ref);
     }
 
+    public static final class PyCapsuleReference extends IdReference<PyCapsule> {
+        private final PyCapsule.CapsuleData data;
+
+        public PyCapsuleReference(HandleContext handleContext, PyCapsule capsule) {
+            super(handleContext, capsule);
+            data = capsule.getData();
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.fine(PythonUtils.formatJString("new %s", toString()));
+            }
+        }
+
+        @Override
+        @TruffleBoundary
+        public String toString() {
+            return String.format("PyCapsuleReference<%s>", data);
+        }
+    }
+
+    @TruffleBoundary
+    public static void registerPyCapsuleDestructor(PyCapsule capsule) {
+        assert PythonContext.get(null).ownsGil();
+        HandleContext handleContext = getContext();
+        PyCapsuleReference ref = new PyCapsuleReference(handleContext, capsule);
+        handleContext.pyCapsuleReferences.add(ref);
+    }
+
     @TruffleBoundary
     @SuppressWarnings("try")
     public static void pollReferenceQueue() {
@@ -442,6 +471,9 @@ public static void pollReferenceQueue() {
                         } else if (entry instanceof NativeStorageReference reference) {
                             handleContext.nativeStorageReferences.remove(reference);
                             processNativeStorageReference(reference);
+                        } else if (entry instanceof PyCapsuleReference reference) {
+                            handleContext.pyCapsuleReferences.remove(reference);
+                            processPyCapsuleReference(reference);
                         }
                     }
                 } finally {
@@ -483,6 +515,15 @@ private static void processNativeStorageReference(NativeStorageReference referen
         freeNativeStorage(reference);
     }
 
+    private static void processPyCapsuleReference(PyCapsuleReference reference) {
+        LOGGER.fine(() -> PythonUtils.formatJString("releasing %s", reference.toString()));
+        if (reference.data.getDestructor() != null) {
+            // Our capsule is dead, so create a temporary copy that doesn't have a reference anymore
+            PyCapsule capsule = PythonObjectFactory.getUncached().createCapsule(reference.data);
+            PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_PY_TRUFFLE_CAPSULE_CALL_DESTRUCTOR, PythonToNativeNode.executeUncached(capsule), capsule.getDestructor());
+        }
+    }
+
     /**
      * Deallocates all objects in the given collection by calling {@code _Py_Dealloc} for each
      * element. This method may therefore run arbitrary guest code and strictly requires the GIL to
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
@@ -3393,7 +3393,11 @@ static PyCapsule doGeneric(GraalHPyContext hpyContext, Object pointer, Object na
                     throw raiseNode.raise(ValueError, ErrorMessages.INVALID_HPYCAPSULE_DESTRUCTOR);
                 }
             }
-            return factory.createCapsule(pointer, namePtr, hpyDestructor);
+            PyCapsule capsule = factory.createCapsule(pointer, namePtr);
+            if (hpyDestructor != null) {
+                capsule.registerDestructor(hpyDestructor);
+            }
+            return capsule;
         }
     }
 
@@ -3469,7 +3473,7 @@ static int doGeneric(GraalHPyContext hpyContext, Object capsule, int key, Object
                     // we may assume that the pointer is owned
                     pyCapsule.setName(fromCharPointerNode.execute(valuePtr, false));
                 }
-                case CapsuleKey.Destructor -> pyCapsule.setDestructor(valuePtr);
+                case CapsuleKey.Destructor -> pyCapsule.registerDestructor(isNullNode.execute(hpyContext, valuePtr) ? null : valuePtr);
                 default -> throw CompilerDirectives.shouldNotReachHere("invalid key");
             }
             return 0;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java
@@ -1534,7 +1534,10 @@ public long ctxCapsuleNew(long pointer, long name, long destructor) {
         } else {
             hpyDestructor = 0;
         }
-        PyCapsule result = slowPathFactory.createCapsule(pointer, new NativePointer(name), hpyDestructor);
+        PyCapsule result = slowPathFactory.createCapsule(pointer, new NativePointer(name));
+        if (hpyDestructor != 0) {
+            result.registerDestructor(hpyDestructor);
+        }
         return GraalHPyBoxing.boxHandle(context.getHPyHandleForObject(result));
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -1601,8 +1601,12 @@ public final DigestObject createDigestObject(PythonBuiltinClassType type, String
         return trace(DigestObject.create(type, getShape(type), name, digest));
     }
 
-    public final PyCapsule createCapsule(Object pointer, Object name, Object destructor) {
-        return trace(new PyCapsule(getLanguage(), pointer, name, destructor));
+    public final PyCapsule createCapsule(Object pointer, Object name) {
+        return createCapsule(new PyCapsule.CapsuleData(pointer, name));
+    }
+
+    public final PyCapsule createCapsule(PyCapsule.CapsuleData data) {
+        return trace(new PyCapsule(getLanguage(), data));
     }
 
     public final MultibyteIncrementalDecoderObject createMultibyteIncrementalDecoderObject(Object type) {

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,7 @@ PyAPI_FUNC(PyTypeObject*) getPyCapsuleTypeReference() {`
`14`	`14`	`return &PyCapsule_Type;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+PyAPI_FUNC(void) PyTruffleCapsule_CallDestructor(PyObject* capsule, PyCapsule_Destructor destructor) {`
	`18`	`+ destructor(capsule);`
	`19`	`+}`
	`20`	`+`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,11 @@ static Object doGeneric(Object pointer, Object name, Object destructor,`
`93`	`93`	`throw raiseNode.get(inliningTarget).raise(ValueError, CALLED_WITH_INVALID_PY_CAPSULE_OBJECT);`
`94`	`94`	`}`
`95`	`95`	`Object n = interopLibrary.isNull(name) ? null : name;`
`96`		`- return factory.createCapsule(pointer, n, destructor);`
	`96`	`+ PyCapsule capsule = factory.createCapsule(pointer, n);`
	`97`	`+ if (!interopLibrary.isNull(destructor)) {`
	`98`	`+ capsule.registerDestructor(destructor);`
	`99`	`+ }`
	`100`	`+ return capsule;`
`97`	`101`	`}`
`98`	`102`	`}`
`99`	`103`
`@@ -305,11 +309,12 @@ abstract static class PyCapsule_SetDestructor extends CApiBinaryBuiltinNode {`
`305`	`309`	`@Specialization`
`306`	`310`	`static int doCapsule(PyCapsule o, Object destructor,`
`307`	`311`	`@Bind("this") Node inliningTarget,`
	`312`	`+ @CachedLibrary(limit = "1") InteropLibrary lib,`
`308`	`313`	`@Cached PRaiseNode.Lazy raiseNode) {`
`309`	`314`	`if (o.getPointer() == null) {`
`310`	`315`	`throw raiseNode.get(inliningTarget).raise(ValueError, CALLED_WITH_INVALID_PY_CAPSULE_OBJECT, "PyCapsule_SetDestructor");`
`311`	`316`	`}`
`312`		`- o.setDestructor(destructor);`
	`317`	`+ o.registerDestructor(lib.isNull(destructor) ? null : destructor);`
`313`	`318`	`return 0;`
`314`	`319`	`}`
`315`	`320`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static Object getcodec(Object encoding,`
`138`	`138`	`throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);`
`139`	`139`	`}`
`140`	`140`
`141`		`- PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);`
	`141`	`+ PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);`
`142`	`142`	`return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ static Object getcodec(Object encoding,`
`130`	`130`	`throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);`
`131`	`131`	`}`
`132`	`132`
`133`		`- PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);`
	`133`	`+ PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);`
`134`	`134`	`return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ static Object getcodec(Object encoding,`
`140`	`140`	`throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);`
`141`	`141`	`}`
`142`	`142`
`143`		`- PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);`
	`143`	`+ PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);`
`144`	`144`	`return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);`
`145`	`145`	`}`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ static Object getcodec(Object encoding,`
`162`	`162`	`throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);`
`163`	`163`	`}`
`164`	`164`
`165`		`- PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);`
	`165`	`+ PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);`
`166`	`166`	`return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ static Object getcodec(Object encoding,`
`135`	`135`	`throw raiseNode.get(inliningTarget).raise(LookupError, NO_SUCH_CODEC_IS_SUPPORTED);`
`136`	`136`	`}`
`137`	`137`
`138`		`- PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME, null);`
	`138`	`+ PyCapsule codecobj = factory.createCapsule(codec, PyMultibyteCodec_CAPSULE_NAME);`
`139`	`139`	`return createCodec(inliningTarget, codecobj, nameMatchesNode, factory, raiseNode);`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ protected static void registerCodec(String name, int cidx, CodecType ct, int mid`
`113`	`113`	`if (midx != -1) {`
`114`	`114`	`DBCSMap h = maps[midx] = new DBCSMap(name, tsName, charset, mt);`
`115`	`115`	`codec.setAttribute(toTruffleStringUncached(h.charsetMapName),`
`116`		`- factory.createCapsule(h, PyMultibyteCodec_CAPSULE_NAME, null));`
	`116`	`+ factory.createCapsule(h, PyMultibyteCodec_CAPSULE_NAME));`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ static Object error(VirtualFrame frame, FieldSet setfunc, Pointer ptr, Object va`
`753`	`753`	`private static TruffleString CTYPES_CFIELD_CAPSULE_NAME_PYMEM = tsLiteral("_ctypes/cfield.c pymem");`
`754`	`754`
`755`	`755`	`private static PyCapsule createPyMemCapsule(Pointer pointer, PythonObjectFactory factory) {`
`756`		`- PyCapsule capsule = factory.createCapsule(pointer, CTYPES_CFIELD_CAPSULE_NAME_PYMEM, null);`
	`756`	`+ PyCapsule capsule = factory.createCapsule(pointer, CTYPES_CFIELD_CAPSULE_NAME_PYMEM);`
`757`	`757`	`new PointerReference(capsule, pointer, PythonContext.get(factory).getSharedFinalizer());`
`758`	`758`	`return capsule;`
`759`	`759`	`}`