Handle managed pointers in DecRefPointerNode

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -110,6 +110,7 @@
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext.ModuleSpec;
 import com.oracle.graal.python.builtins.objects.cext.common.GetNextVaArgNode;
+import com.oracle.graal.python.builtins.objects.cext.common.NativePointer;
 import com.oracle.graal.python.builtins.objects.cext.structs.CFields;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructs;
@@ -1104,20 +1105,36 @@ public static void executeUncached(Object pointer) {
         public abstract void execute(Node inliningTarget, Object pointer);
 
         @Specialization
-        static void doDecref(Node inliningTarget, Object pointer,
+        static void doDecref(Node inliningTarget, Object pointerObj,
+                        @CachedLibrary(limit = "2") InteropLibrary lib,
                         @Cached(inline = false) CApiTransitions.ToPythonWrapperNode toPythonWrapperNode,
                         @Cached InlinedBranchProfile isWrapperProfile,
                         @Cached InlinedBranchProfile isNativeObject,
                         @Cached(inline = false) CStructAccess.ReadI64Node readRefcount,
                         @Cached(inline = false) CStructAccess.WriteLongNode writeRefcount,
                         @Cached(inline = false) PCallCapiFunction callDealloc) {
+            long pointer;
+            if (pointerObj instanceof Long longPointer) {
+                pointer = longPointer;
+            } else {
+                if (lib.isPointer(pointerObj)) {
+                    try {
+                        pointer = lib.asPointer(pointerObj);
+                    } catch (UnsupportedMessageException e) {
+                        throw CompilerDirectives.shouldNotReachHere();
+                    }
+                } else {
+                    // No refcounting in managed mode
+                    return;
+                }
+            }
             PythonNativeWrapper wrapper = toPythonWrapperNode.executeWrapper(pointer, false);
             if (wrapper instanceof PythonAbstractObjectNativeWrapper objectWrapper) {
                 isWrapperProfile.enter(inliningTarget);
                 objectWrapper.decRef();
             } else if (wrapper == null) {
                 isNativeObject.enter(inliningTarget);
-                assert NativeToPythonNode.executeUncached(pointer) instanceof PythonAbstractNativeObject;
+                assert NativeToPythonNode.executeUncached(new NativePointer(pointer)) instanceof PythonAbstractNativeObject;
                 long refcount = readRefcount.read(pointer, PyObject__ob_refcnt);
                 if (refcount != IMMORTAL_REFCNT) {
                     refcount--;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PythonNativeWrapper.java

@@ -198,16 +198,10 @@ public final long getRefCount() {
             return MANAGED_REFCNT;
         }
 
-        public final void setRefCount(Node inliningTarget, long refCount, InlinedConditionProfile hasRefProfile) {
-            CApiTransitions.writeNativeRefCount(HandlePointerConverter.pointerToStub(getNativePointer()), refCount);
-            updateRef(inliningTarget, refCount, hasRefProfile);
-        }
-
         /**
          * Adjusts the native wrapper's reference to be weak (if {@code refCount <= MANAGED_REFCNT})
          * or to be strong (if {@code refCount > MANAGED_REFCNT}) if there is a reference. This
-         * method should be called at appropriate points in the program, e.g., method
-         * {@link #setRefCount(Node, long, InlinedConditionProfile)} uses it, or it should be called
+         * method should be called at appropriate points in the program, e.g., it should be called
          * from native code if the refcount falls below {@link #MANAGED_REFCNT}.
          */
         public final void updateRef(Node inliningTarget, long refCount, InlinedConditionProfile hasRefProfile) {
@@ -233,6 +227,7 @@ public void incRef() {
 
         @TruffleBoundary(allowInlining = true)
         public long decRef() {
+            assert isNative();
             long pointer = HandlePointerConverter.pointerToStub(getNativePointer());
             long refCount = CApiTransitions.readNativeRefCount(pointer);
             if (refCount != IMMORTAL_REFCNT) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java

@@ -81,7 +81,6 @@ public final int getCapacity() {
 
     public abstract SequenceStorage copy();
 
-
     /**
      * Get internal array object without copying. Note: The length must be taken from the sequence
      * storage object.