[GR-26317] Prefer implementing the 'withState' variants of PythonObjectLibrary messages.

PullRequest: graalpython/1296

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -514,10 +514,10 @@ static boolean isMappingType(PythonBuiltinClassType type,
     }
 
     @ExportMessage
-    static long hash(PythonBuiltinClassType type,
+    static long hashWithState(PythonBuiltinClassType type, ThreadState state,
                     @CachedContext(PythonLanguage.class) PythonContext context,
                     @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
-        return lib.hash(context.getCore().lookupType(type));
+        return lib.hashWithState(context.getCore().lookupType(type), state);
     }
 
     @ExportMessage

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

@@ -117,7 +117,7 @@ public String toString() {
     }
 
     @ExportMessage(limit = "2")
-    long hash(
+    long hashWithState(@SuppressWarnings("unused") ThreadState state,
                     @CachedLibrary("this.getPointerObject()") InteropLibrary lib) {
         if (lib.hasIdentity(object)) {
             try {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java

@@ -228,7 +228,7 @@ public Object asIndexWithState(@SuppressWarnings("unused") ThreadState threadSta
     }
 
     @ExportMessage
-    public int asFileDescriptor(
+    public int asFileDescriptorWithState(@SuppressWarnings("unused") ThreadState state,
                     @Exclusive @Cached PRaiseNode raiseNode,
                     @Exclusive @Cached CastToJavaIntExactNode castToJavaIntNode) {
         try {
@@ -287,6 +287,11 @@ public PInt asPInt() {
         return this;
     }
 
+    @ExportMessage
+    public PInt asPIntWithState(@SuppressWarnings("unused") ThreadState state) {
+        return this;
+    }
+
     @Override
     public int hashCode() {
         return value.hashCode();
@@ -563,6 +568,11 @@ public long hash() {
         return hashBigInteger(value);
     }
 
+    @ExportMessage
+    public long hashWithState(@SuppressWarnings("unused") ThreadState state) {
+        return hash();
+    }
+
     @TruffleBoundary
     public static long hashBigInteger(BigInteger i) {
         long h = i.remainder(BigInteger.valueOf(SysModuleBuiltins.HASH_MODULUS)).longValue();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/PBigRange.java

@@ -131,17 +131,17 @@ public BigInteger getBigIntItemNormalized(BigInteger index) {
     }
 
     @ExportMessage
-    public int length(@CachedLibrary("this.length") PythonObjectLibrary pol,
+    public int lengthWithState(@SuppressWarnings("unused") ThreadState state, @CachedLibrary("this.length") PythonObjectLibrary pol,
                     @Cached PRaiseNode raiseNode) {
         if (pol.canBeIndex(length)) {
-            return pol.asSize(length);
+            return pol.asSizeWithState(length, state);
         }
         throw raiseNode.raiseNumberTooLarge(OverflowError, length);
     }
 
     @ExportMessage
     @TruffleBoundary
-    public boolean isTrue() {
+    public boolean isTrueWithState(@SuppressWarnings("unused") ThreadState state) {
         return length.getValue().compareTo(BigInteger.ZERO) != 0;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/PRange.java

@@ -26,6 +26,7 @@
 package com.oracle.graal.python.builtins.objects.range;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -70,7 +71,7 @@ public boolean isIterable() {
     }
 
     @ExportMessage
-    public String asPString() {
+    public String asPStringWithState(@SuppressWarnings("unused") ThreadState state) {
         return toString();
     }