Skip to content

Commit cdca2b3

Browse files
committed
Remove redundant PythonNativeWrapper.IMMORTAL_REFCNT
1 parent 445cffd commit cdca2b3

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath;
7171
import com.oracle.graal.python.builtins.objects.PNone;
7272
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.CreateModuleNodeGen;
73+
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper.PythonAbstractObjectNativeWrapper;
7374
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
7475
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
7576
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PointerContainer;
@@ -213,7 +214,7 @@ public CApiContext(PythonContext context, Object llvmLibrary, boolean useNativeB
213214
primitiveNativeWrapperCache = new PrimitiveNativeWrapper[262];
214215
for (int i = 0; i < primitiveNativeWrapperCache.length; i++) {
215216
PrimitiveNativeWrapper nativeWrapper = PrimitiveNativeWrapper.createInt(i - 5);
216-
CApiTransitions.incRef(nativeWrapper, PythonNativeWrapper.IMMORTAL_REFCNT);
217+
CApiTransitions.incRef(nativeWrapper, PythonAbstractObjectNativeWrapper.IMMORTAL_REFCNT);
217218
primitiveNativeWrapperCache[i] = nativeWrapper;
218219
}
219220
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public abstract class PythonNativeWrapper implements TruffleObject {
5858

5959
private static final TruffleLogger LOGGER = CApiContext.getLogger(PythonNativeWrapper.class);
6060

61-
public static final long IMMORTAL_REFCNT = 256 * 256;
62-
6361
private static final long UNINITIALIZED = -1;
6462

6563
private Object delegate;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static PythonAbstractObjectNativeWrapper doSingleton(@SuppressWarnings("unused")
158158
CompilerDirectives.transferToInterpreterAndInvalidate();
159159
nativeWrapper = new PythonObjectNativeWrapper(object);
160160
// this should keep the native wrapper alive forever
161-
CApiTransitions.incRef(nativeWrapper, PythonNativeWrapper.IMMORTAL_REFCNT);
161+
CApiTransitions.incRef(nativeWrapper, PythonAbstractObjectNativeWrapper.IMMORTAL_REFCNT);
162162
context.setSingletonNativeWrapper(object, nativeWrapper);
163163
}
164164
return nativeWrapper;

0 commit comments

Comments
 (0)