[GR-24233] Do not eagerly remove resurrected native object references.

PullRequest: graalpython/1041

Author: fangerer

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

@@ -402,18 +402,23 @@ Py_ssize_t PyTruffle_SUBREF(PyObject* obj, Py_ssize_t value) {
 Py_ssize_t PyTruffle_bulk_SUBREF(PyObject* ptrArray[], Py_ssize_t values[], int64_t len) {
 	int64_t i;
 	PyObject* obj;
+	Py_ssize_t value;
 
 	for (i=0; i < len; i++) {
 		obj = ptrArray[i];
-		Py_ssize_t new_value = ((obj->ob_refcnt) -= values[i]);
-		if (new_value == 0) {
-			_Py_Dealloc(obj);
-		}
+		value = values[i];
+		/* IMPORTANT: 'value == 0' indicates we should not process the reference at all */
+		if (value > 0) {
+			Py_ssize_t new_value = ((obj->ob_refcnt) -= value);
+			if (new_value == 0) {
+				_Py_Dealloc(obj);
+			}
 #ifdef Py_REF_DEBUG
-		else if (new_value < 0) {
-			_Py_NegativeRefcount(filename, lineno, op);
-		}
+			else if (new_value < 0) {
+				_Py_NegativeRefcount(filename, lineno, op);
+			}
 #endif
+		}
 	}
     return 0;
 }

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

@@ -43,7 +43,6 @@
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -319,7 +318,6 @@ public Object execute(VirtualFrame frame) {
             CalleeContext.enter(frame, customLocalsProfile);
             try {
                 NativeObjectReference[] nativeObjectReferences = (NativeObjectReference[]) PArguments.getArgument(frame, 0);
-                NativeObjectReference nativeObjectReference;
                 int cleaned = 0;
                 long allocatedNativeMem = cApiContext.allocatedMemory;
                 long startTime = 0;
@@ -339,18 +337,23 @@ public Object execute(VirtualFrame frame) {
                     }
 
                     for (int i = 0; i < n; i++) {
-                        nativeObjectReference = nativeObjectReferences[i];
-                        cApiContext.nativeObjectWrapperList.remove(nativeObjectReference.id);
+                        NativeObjectReference nativeObjectReference = nativeObjectReferences[i];
                         Object pointerObject = nativeObjectReference.ptrObject;
-                        if (!nativeObjectReference.resurrect && !pointerObjectLib.isNull(pointerObject)) {
-                            cApiContext.checkAccess(pointerObject, pointerObjectLib);
-                            LOGGER.finer(() -> "Cleaning native object reference to " + CApiContext.asHex(pointerObject));
-                            cleaned++;
+                        if (!nativeObjectReference.resurrect) {
+                            cApiContext.nativeObjectWrapperList.remove(nativeObjectReference.id);
+                            if (!nativeObjectReference.resurrect && !pointerObjectLib.isNull(pointerObject)) {
+                                cApiContext.checkAccess(pointerObject, pointerObjectLib);
+                                LOGGER.finer(() -> "Cleaning native object reference to " + CApiContext.asHex(pointerObject));
+                                cleaned++;
+                            }
                         }
                     }
                 } else {
                     for (int i = 0; i < n; i++) {
-                        cApiContext.nativeObjectWrapperList.remove(nativeObjectReferences[i].id);
+                        NativeObjectReference nativeObjectReference = nativeObjectReferences[i];
+                        if (!nativeObjectReference.resurrect) {
+                            cApiContext.nativeObjectWrapperList.remove(nativeObjectReference.id);
+                        }
                     }
                 }
 
@@ -377,26 +380,6 @@ public Object execute(VirtualFrame frame) {
             return PNone.NONE;
         }
 
-        @TruffleBoundary
-        private static NativeObjectReference pollFirst(ArrayDeque<NativeObjectReference> deque) {
-            return deque.pollFirst();
-        }
-
-        @TruffleBoundary
-        private static int size(ArrayList<NativeObjectReference> deque) {
-            return deque.size();
-        }
-
-        @TruffleBoundary
-        private static NativeObjectReference get(ArrayList<NativeObjectReference> deque, int i) {
-            return deque.get(i);
-        }
-
-        @TruffleBoundary
-        private static NativeObjectReference clear(ArrayList<NativeObjectReference> deque, int i) {
-            return deque.set(i, null);
-        }
-
         @Override
         public Signature getSignature() {
             return SIGNATURE;