Turn DecRefNode into XDecRefNode

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java

@@ -1715,7 +1715,7 @@ protected abstract static class PyDECREFNode extends PythonUnaryBuiltinNode {
         static Object doGeneric(Object arg) {
             CApiContext.ensureCapiWasLoaded();
             Object nativePointer = CApiTransitions.PythonToNativeNode.executeUncached(arg);
-            CExtNodes.DecRefPointerNode.executeUncached(nativePointer);
+            CExtNodes.XDecRefPointerNode.executeUncached(nativePointer);
             return arg;
         }
     }

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

@@ -1136,10 +1136,10 @@ static PRaiseNativeNode doIt(@Cached(inline = false) PRaiseNativeNode node) {
     @GenerateInline
     @GenerateCached(false)
     @GenerateUncached
-    public abstract static class DecRefPointerNode extends PNodeWithContext {
+    public abstract static class XDecRefPointerNode extends PNodeWithContext {
 
         public static void executeUncached(Object pointer) {
-            CExtNodesFactory.DecRefPointerNodeGen.getUncached().execute(null, pointer);
+            CExtNodesFactory.XDecRefPointerNodeGen.getUncached().execute(null, pointer);
         }
 
         public abstract void execute(Node inliningTarget, Object pointer);
@@ -1168,6 +1168,9 @@ static void doDecref(Node inliningTarget, Object pointerObj,
                     return;
                 }
             }
+            if (pointer == 0) {
+                return;
+            }
             PythonNativeWrapper wrapper = toPythonWrapperNode.executeWrapper(pointer, false);
             if (wrapper instanceof PythonAbstractObjectNativeWrapper objectWrapper) {
                 isWrapperProfile.enter(inliningTarget);

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

@@ -2232,7 +2232,7 @@ static void doObjectCachedLen(NativeObjectSequenceStorage storage,
                         @Bind("this") Node inliningTarget,
                         @Cached("storage.length()") int cachedLen,
                         @Shared @Cached CStructAccess.ReadPointerNode readNode,
-                        @Shared @Cached CExtNodes.DecRefPointerNode decRefPointerNode,
+                        @Shared @Cached CExtNodes.XDecRefPointerNode decRefPointerNode,
                         @Shared @Cached CStructAccess.FreeNode freeNode) {
             for (int i = 0; i < cachedLen; i++) {
                 Object elementPointer = readNode.readArrayElement(storage.getPtr(), i);
@@ -2246,7 +2246,7 @@ static void doObjectCachedLen(NativeObjectSequenceStorage storage,
         static void doObjectGeneric(NativeObjectSequenceStorage storage,
                         @Bind("this") Node inliningTarget,
                         @Shared @Cached CStructAccess.ReadPointerNode readNode,
-                        @Shared @Cached CExtNodes.DecRefPointerNode decRefPointerNode,
+                        @Shared @Cached CExtNodes.XDecRefPointerNode decRefPointerNode,
                         @Shared @Cached CStructAccess.FreeNode freeNode) {
             for (int i = 0; i < storage.length(); i++) {
                 Object elementPointer = readNode.readArrayElement(storage.getPtr(), i);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -1109,7 +1109,7 @@ protected static void doNativeObject(NativeObjectSequenceStorage storage, int id
                         @Cached PythonToNativeNewRefNode toNative,
                         @Cached CStructAccess.ReadPointerNode readPointerNode,
                         @Cached CStructAccess.WritePointerNode writePointerNode,
-                        @Cached CExtNodes.DecRefPointerNode decRefPointerNode) {
+                        @Cached CExtNodes.XDecRefPointerNode decRefPointerNode) {
             Object old = readPointerNode.readArrayElement(storage.getPtr(), idx);
             writePointerNode.writeArrayElement(storage.getPtr(), idx, toNative.execute(value));
             decRefPointerNode.execute(inliningTarget, old);
@@ -2986,16 +2986,13 @@ public abstract static class SetNativeLenNode extends Node {
         @InliningCutoff
         static void doShrink(NativeObjectSequenceStorage s, int len,
                         @Bind("this") Node inliningTarget,
-                        @CachedLibrary(limit = "1") InteropLibrary lib,
                         @Cached CStructAccess.ReadPointerNode readNode,
-                        @Cached CExtNodes.DecRefPointerNode decRefPointerNode) {
+                        @Cached CExtNodes.XDecRefPointerNode decRefPointerNode) {
             if (len < s.length()) {
                 // When shrinking, we need to decref the items that are now past the end
                 for (int i = len; i < s.length(); i++) {
                     Object elementPointer = readNode.readArrayElement(s.getPtr(), i);
-                    if (!lib.isNull(elementPointer)) {
-                        decRefPointerNode.execute(inliningTarget, elementPointer);
-                    }
+                    decRefPointerNode.execute(inliningTarget, elementPointer);
                 }
             }
             s.setNewLength(len);