Fix handling native objects in NativePtrToPythonNode

msimacek · msimacek · commit 6160a585fcd5 · 2024-04-24T16:41:20.000+02:00
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
@@ -1560,7 +1560,7 @@ Object doNonWrapper(long pointer, boolean stealing,
                     Object ref = lookup.get();
                     if (createNativeProfile.profile(inliningTarget, ref == null)) {
                         LOGGER.fine(() -> "re-creating collected PythonAbstractNativeObject reference" + Long.toHexString(pointer));
-                        return createAbstractNativeObject(nativeContext, pointer, stealing, pointer);
+                        return createAbstractNativeObject(nativeContext, new NativePointer(pointer), stealing, pointer);
                     }
                     if (isNativeWrapperProfile.profile(inliningTarget, ref instanceof PythonNativeWrapper)) {
                         wrapper = (PythonNativeWrapper) ref;
@@ -1572,7 +1572,7 @@ Object doNonWrapper(long pointer, boolean stealing,
                         return result;
                     }
                 } else {
-                    return createAbstractNativeObject(nativeContext, pointer, stealing, pointer);
+                    return createAbstractNativeObject(nativeContext, new NativePointer(pointer), stealing, pointer);
                 }
             }
             return NativeToPythonNode.handleWrapper(inliningTarget, wrapperProfile, stealing, wrapper);

Original file line number	Diff line number	Diff line change
`@@ -1560,7 +1560,7 @@ Object doNonWrapper(long pointer, boolean stealing,`
`1560`	`1560`	`Object ref = lookup.get();`
`1561`	`1561`	`if (createNativeProfile.profile(inliningTarget, ref == null)) {`
`1562`	`1562`	`LOGGER.fine(() -> "re-creating collected PythonAbstractNativeObject reference" + Long.toHexString(pointer));`
`1563`		`- return createAbstractNativeObject(nativeContext, pointer, stealing, pointer);`
	`1563`	`+ return createAbstractNativeObject(nativeContext, new NativePointer(pointer), stealing, pointer);`
`1564`	`1564`	`}`
`1565`	`1565`	`if (isNativeWrapperProfile.profile(inliningTarget, ref instanceof PythonNativeWrapper)) {`
`1566`	`1566`	`wrapper = (PythonNativeWrapper) ref;`
`@@ -1572,7 +1572,7 @@ Object doNonWrapper(long pointer, boolean stealing,`
`1572`	`1572`	`return result;`
`1573`	`1573`	`}`
`1574`	`1574`	`} else {`
`1575`		`- return createAbstractNativeObject(nativeContext, pointer, stealing, pointer);`
	`1575`	`+ return createAbstractNativeObject(nativeContext, new NativePointer(pointer), stealing, pointer);`
`1576`	`1576`	`}`
`1577`	`1577`	`}`
`1578`	`1578`	`return NativeToPythonNode.handleWrapper(inliningTarget, wrapperProfile, stealing, wrapper);`