Make non-state variants of remaining POL methods final

msimacek · msimacek · commit e89c49e89988 · 2020-10-23T10:37:42.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonBooleanExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonBooleanExports.java
@@ -104,7 +104,7 @@ static long hash(boolean value) {
     }
 
     @ExportMessage
-    static boolean isTrue(Boolean value) {
+    static boolean isTrueWithState(Boolean value, @SuppressWarnings("unused") ThreadState threadState) {
         return value;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonDoubleExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonDoubleExports.java
@@ -121,7 +121,7 @@ static long hash(double number) {
     }
 
     @ExportMessage
-    static boolean isTrue(Double value) {
+    static boolean isTrueWithState(Double value, @SuppressWarnings("unused") ThreadState threadState) {
         return value != 0.0;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonIntegerExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonIntegerExports.java
@@ -103,7 +103,7 @@ static long hash(int value) {
     }
 
     @ExportMessage
-    static boolean isTrue(Integer value) {
+    static boolean isTrueWithState(Integer value, @SuppressWarnings("unused") ThreadState threadState) {
         return value != 0;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonLongExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonLongExports.java
@@ -126,7 +126,7 @@ static long hash(long value) {
     }
 
     @ExportMessage
-    static boolean isTrue(Long value) {
+    static boolean isTrueWithState(Long value, @SuppressWarnings("unused") ThreadState threadState) {
         return value != 0;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonObjectExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonObjectExports.java
@@ -139,7 +139,7 @@ static long hashWithState(Object receiver, @SuppressWarnings("unused") ThreadSta
     }
 
     @ExportMessage
-    static int length(Object receiver,
+    static int lengthWithState(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                     @Shared("raiseNode") @Cached PRaiseNode raise,
                     @CachedLibrary("receiver") InteropLibrary interopLib) {
         if (interopLib.hasArrayElements(receiver)) {
@@ -161,9 +161,9 @@ static int length(Object receiver,
     }
 
     @ExportMessage
-    static class IsTrue {
+    static class IsTrueWithState {
         @Specialization(guards = "lib.isBoolean(receiver)")
-        static boolean bool(Object receiver,
+        static boolean bool(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @CachedLibrary("receiver") InteropLibrary lib) {
             try {
                 return lib.asBoolean(receiver);
@@ -174,7 +174,7 @@ static boolean bool(Object receiver,
         }
 
         @Specialization(guards = "lib.fitsInLong(receiver)")
-        static boolean integer(Object receiver,
+        static boolean integer(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @CachedLibrary("receiver") InteropLibrary lib) {
             try {
                 return lib.asLong(receiver) != 0;
@@ -185,7 +185,7 @@ static boolean integer(Object receiver,
         }
 
         @Specialization(guards = "lib.fitsInDouble(receiver)")
-        static boolean floatingPoint(Object receiver,
+        static boolean floatingPoint(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @CachedLibrary("receiver") InteropLibrary lib) {
             try {
                 return lib.asDouble(receiver) != 0.0;
@@ -196,7 +196,7 @@ static boolean floatingPoint(Object receiver,
         }
 
         @Specialization(guards = "lib.hasArrayElements(receiver)")
-        static boolean array(Object receiver,
+        static boolean array(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @CachedLibrary("receiver") InteropLibrary lib) {
             try {
                 return lib.getArraySize(receiver) > 0;
@@ -210,7 +210,7 @@ static boolean array(Object receiver,
                         "!lib.isBoolean(receiver)", "!lib.fitsInLong(receiver)",
                         "!lib.fitsInDouble(receiver)", "!lib.hasArrayElements(receiver)"
         })
-        static boolean generic(Object receiver,
+        static boolean generic(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @CachedLibrary("receiver") InteropLibrary lib) {
             return !lib.isNull(receiver);
         }
@@ -361,10 +361,10 @@ static Object lookupAndCallRegularMethodWithState(Object receiver, ThreadState s
     }
 
     @ExportMessage
-    abstract static class GetIterator {
+    abstract static class GetIteratorWithState {
 
         @Specialization(guards = "lib.hasArrayElements(receiver)")
-        static PForeignArrayIterator doForeignArray(Object receiver,
+        static PForeignArrayIterator doForeignArray(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @Shared("factory") @Cached PythonObjectFactory factory,
                         @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                         @CachedLibrary("receiver") InteropLibrary lib) {
@@ -380,7 +380,7 @@ static PForeignArrayIterator doForeignArray(Object receiver,
         }
 
         @Specialization(guards = "lib.isString(receiver)")
-        static PStringIterator doBoxedString(Object receiver,
+        static PStringIterator doBoxedString(Object receiver, @SuppressWarnings("unused") ThreadState threadState,
                         @Shared("factory") @Cached PythonObjectFactory factory,
                         @CachedLibrary("receiver") InteropLibrary lib) {
             try {
@@ -391,15 +391,15 @@ static PStringIterator doBoxedString(Object receiver,
         }
 
         @Specialization(replaces = {"doForeignArray", "doBoxedString"})
-        static PythonBuiltinObject doGeneric(Object receiver,
+        static PythonBuiltinObject doGeneric(Object receiver, ThreadState threadState,
                         @Shared("factory") @Cached PythonObjectFactory factory,
                         @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                         @CachedLibrary("receiver") InteropLibrary lib) {
 
             if (lib.hasArrayElements(receiver)) {
-                return doForeignArray(receiver, factory, raiseNode, lib);
+                return doForeignArray(receiver, threadState, factory, raiseNode, lib);
             } else if (lib.isString(receiver)) {
-                return doBoxedString(receiver, factory, lib);
+                return doBoxedString(receiver, threadState, factory, lib);
             }
             throw raiseNode.raise(TypeError, ErrorMessages.FOREIGN_OBJ_ISNT_ITERABLE);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonStringExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonStringExports.java
@@ -107,12 +107,12 @@ static long hashWithState(String self, @SuppressWarnings("unused") ThreadState s
     }
 
     @ExportMessage
-    static int length(String self) {
+    static int lengthWithState(String self, @SuppressWarnings("unused") ThreadState threadState) {
         return self.length();
     }
 
     @ExportMessage
-    static boolean isTrue(String self) {
+    static boolean isTrueWithState(String self, @SuppressWarnings("unused") ThreadState threadState) {
         return self.length() > 0;
     }
 
@@ -243,7 +243,7 @@ static boolean typeCheck(@SuppressWarnings("unused") String receiver, Object typ
     }
 
     @ExportMessage
-    static PStringIterator getIterator(String receiver,
+    static PStringIterator getIteratorWithState(String receiver, @SuppressWarnings("unused") ThreadState threadState,
                     @Cached PythonObjectFactory factory) {
         return factory.createStringIterator(receiver);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java
@@ -932,16 +932,13 @@ public boolean isSequence(Object receiver) {
      * {@code slot_nb_bool} coercion and {@link #length}/{@link #lengthWithState}.
      */
     public boolean isTrueWithState(Object receiver, ThreadState state) {
-        if (state == null) {
-            return true;
-        }
-        return isTrue(receiver);
+        return true;
     }
 
     /**
      * @see #isTrueWithState
      */
-    public boolean isTrue(Object receiver) {
+    public final boolean isTrue(Object receiver) {
         return isTrueWithState(receiver, null);
     }
 
@@ -967,16 +964,13 @@ public final boolean isTrue(Object receiver, VirtualFrame frame) {
      * that slot.
      */
     public int lengthWithState(Object receiver, ThreadState state) {
-        if (state == null) {
-            throw PRaiseNode.getUncached().raiseHasNoLength(receiver);
-        }
-        return length(receiver);
+        throw PRaiseNode.getUncached().raiseHasNoLength(receiver);
     }
 
     /**
      * @see #lengthWithState
      */
-    public int length(Object receiver) {
+    public final int length(Object receiver) {
         return lengthWithState(receiver, null);
     }
 
@@ -1102,16 +1096,13 @@ public boolean typeCheck(Object receiver, Object type) {
      * Implements the logic from {@code PyObject_GetIter}.
      */
     public Object getIteratorWithState(Object receiver, ThreadState state) {
-        if (state == null) {
-            throw PRaiseNode.getUncached().raise(PythonBuiltinClassType.TypeError, ErrorMessages.OBJ_NOT_ITERABLE, receiver);
-        }
-        return getIterator(receiver);
+        throw PRaiseNode.getUncached().raise(PythonBuiltinClassType.TypeError, ErrorMessages.OBJ_NOT_ITERABLE, receiver);
     }
 
     /**
      * @see #getIteratorWithState
      */
-    public Object getIterator(Object receiver) {
+    public final Object getIterator(Object receiver) {
         return getIteratorWithState(receiver, null);
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/PIntRange.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/PIntRange.java
@@ -118,12 +118,7 @@ public int lengthWithState(@SuppressWarnings("unused") ThreadState state) {
     }
 
     @ExportMessage
-    public boolean isTrue() {
-        return length != 0;
-    }
-
-    @ExportMessage
-    public boolean isTrueWithState(@SuppressWarnings("unused") ThreadState state) {
+    public boolean isTrueWithState(@SuppressWarnings("unused") ThreadState threadState) {
         return length != 0;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/PBaseSet.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/PBaseSet.java
@@ -29,12 +29,15 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
-import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @ExportLibrary(PythonObjectLibrary.class)
 public abstract class PBaseSet extends PHashingCollection {
@@ -62,14 +65,13 @@ public void setDictStorage(HashingStorage storage) {
     }
 
     @ExportMessage(limit = "1")
-    int lengthWithState(PArguments.ThreadState state,
+    int lengthWithState(ThreadState state,
+                    @Exclusive @Cached ConditionProfile gotState,
                     @CachedLibrary("this.set") HashingStorageLibrary lib) {
-        return lib.lengthWithState(set, state);
-    }
-
-    @ExportMessage(limit = "1")
-    int length(
-                    @CachedLibrary("this.set") HashingStorageLibrary lib) {
-        return lib.length(set);
+        if (gotState.profile(state != null)) {
+            return lib.lengthWithState(set, state);
+        } else {
+            return lib.length(set);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ static long hash(boolean value) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@ExportMessage`
`107`		`- static boolean isTrue(Boolean value) {`
	`107`	`+ static boolean isTrueWithState(Boolean value, @SuppressWarnings("unused") ThreadState threadState) {`
`108`	`108`	`return value;`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ static long hash(double number) {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@ExportMessage`
`124`		`- static boolean isTrue(Double value) {`
	`124`	`+ static boolean isTrueWithState(Double value, @SuppressWarnings("unused") ThreadState threadState) {`
`125`	`125`	`return value != 0.0;`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static long hash(int value) {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@ExportMessage`
`106`		`- static boolean isTrue(Integer value) {`
	`106`	`+ static boolean isTrueWithState(Integer value, @SuppressWarnings("unused") ThreadState threadState) {`
`107`	`107`	`return value != 0;`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ static long hash(long value) {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@ExportMessage`
`129`		`- static boolean isTrue(Long value) {`
	`129`	`+ static boolean isTrueWithState(Long value, @SuppressWarnings("unused") ThreadState threadState) {`
`130`	`130`	`return value != 0;`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,12 @@ static long hashWithState(String self, @SuppressWarnings("unused") ThreadState s`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@ExportMessage`
`110`		`- static int length(String self) {`
	`110`	`+ static int lengthWithState(String self, @SuppressWarnings("unused") ThreadState threadState) {`
`111`	`111`	`return self.length();`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@ExportMessage`
`115`		`- static boolean isTrue(String self) {`
	`115`	`+ static boolean isTrueWithState(String self, @SuppressWarnings("unused") ThreadState threadState) {`
`116`	`116`	`return self.length() > 0;`
`117`	`117`	`}`
`118`	`118`
`@@ -243,7 +243,7 @@ static boolean typeCheck(@SuppressWarnings("unused") String receiver, Object typ`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`@ExportMessage`
`246`		`- static PStringIterator getIterator(String receiver,`
	`246`	`+ static PStringIterator getIteratorWithState(String receiver, @SuppressWarnings("unused") ThreadState threadState,`
`247`	`247`	`@Cached PythonObjectFactory factory) {`
`248`	`248`	`return factory.createStringIterator(receiver);`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,7 @@ public int lengthWithState(@SuppressWarnings("unused") ThreadState state) {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`@ExportMessage`
`121`		`- public boolean isTrue() {`
`122`		`- return length != 0;`
`123`		`- }`
`124`		`-`
`125`		`- @ExportMessage`
`126`		`- public boolean isTrueWithState(@SuppressWarnings("unused") ThreadState state) {`
	`121`	`+ public boolean isTrueWithState(@SuppressWarnings("unused") ThreadState threadState) {`
`127`	`122`	`return length != 0;`
`128`	`123`	`}`
`129`	`124`