[GR-27443] Use exact conversion in PInt.asJavaLong, fixed int shortcut in argument clinic

PullRequest: graalpython/1390

Author: otethal

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

@@ -43,7 +43,7 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CastToJavaDoubleNode;
 import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
-import com.oracle.graal.python.nodes.util.CastToJavaLongLossyNode;
+import com.oracle.graal.python.nodes.util.CastToJavaLongExactNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.OverflowException;
@@ -277,7 +277,7 @@ public boolean canBeJavaLong() {
 
     @ExportMessage
     public long asJavaLongWithState(@SuppressWarnings("unused") ThreadState threadState,
-                    @Cached CastToJavaLongLossyNode castToLong) {
+                    @Cached CastToJavaLongExactNode castToLong) {
         return castToLong.execute(this);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonStringExports.java

@@ -84,22 +84,6 @@ static Object getLazyPythonClass(@SuppressWarnings("unused") String value) {
         return PythonBuiltinClassType.PString;
     }
 
-    @ExportMessage
-    static boolean isBuffer(@SuppressWarnings("unused") String str) {
-        return false;
-    }
-
-    @ExportMessage
-    static int getBufferLength(@SuppressWarnings("unused") String str) {
-        return getBufferBytes(str).length;
-    }
-
-    @ExportMessage
-    @TruffleBoundary
-    static byte[] getBufferBytes(String str) {
-        return str.getBytes();
-    }
-
     @ExportMessage
     @TruffleBoundary
     static long hashWithState(String self, @SuppressWarnings("unused") ThreadState state) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonTernaryClinicBuiltinNode.java

@@ -79,7 +79,7 @@ protected Object castWithNode(ArgumentClinicProvider clinic, VirtualFrame frame,
     public Object callWithInt(VirtualFrame frame, Object arg, int arg2, Object arg3) {
         ArgumentClinicProvider clinic = getArgumentClinic();
         if (clinic.acceptsInt(1)) {
-            return executeWithInt(frame, arg, arg2, arg3);
+            return executeWithInt(frame, cast(clinic, frame, 0, arg), arg2, cast(clinic, frame, 2, arg3));
         } else {
             return call(frame, arg, arg2, arg3);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaIntConversionNode.java

@@ -47,9 +47,11 @@
 import com.oracle.graal.python.annotations.ClinicConverterFactory.DefaultValue;
 import com.oracle.graal.python.annotations.ClinicConverterFactory.UseDefaultForNone;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
+import com.oracle.graal.python.nodes.util.CastToJavaLongLossyNode;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -65,12 +67,13 @@ protected JavaIntConversionNode(int defaultValue, boolean useDefaultForNone) {
     int doOthers(VirtualFrame frame, Object value,
                     @Cached IsSubtypeNode isSubtypeNode,
                     @Cached BranchProfile isFloatProfile,
-                    @CachedLibrary("value") PythonObjectLibrary lib) {
+                    @CachedLibrary("value") PythonObjectLibrary lib,
+                    @Cached CastToJavaLongLossyNode castToLongNode) {
         if (isSubtypeNode.execute(lib.getLazyPythonClass(value), PythonBuiltinClassType.PFloat)) {
             isFloatProfile.enter();
             throw raise(TypeError, ErrorMessages.INTEGER_EXPECTED_GOT_FLOAT);
         }
-        long result = lib.asJavaLong(value, frame);
+        long result = castToLongNode.execute(lib.asPIntWithState(value, PArguments.getThreadState(frame)));
         if (!fitsInInt(result)) {
             throw raise(TypeError, ErrorMessages.VALUE_TOO_LARGE_TO_FIT_INTO_INDEX);
         }