Replace exception-based int narrowing with a helper node

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java

@@ -65,6 +65,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.nodes.util.NarrowBigIntegerNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -2599,15 +2600,17 @@ public double count(double x) {
     public abstract static class IsqrtNode extends PythonUnaryBuiltinNode {
 
         @Specialization
-        Object isqrtLong(long x) {
+        Object isqrtLong(long x,
+                        @Cached NarrowBigIntegerNode makeInt) {
             raiseIfNegative(x < 0);
-            return makeInt(op(PInt.longToBigInteger(x)));
+            return makeInt.execute(op(PInt.longToBigInteger(x)));
         }
 
         @Specialization
-        Object isqrtPInt(PInt x) {
+        Object isqrtPInt(PInt x,
+                        @Cached NarrowBigIntegerNode makeInt) {
             raiseIfNegative(x.isNegative());
-            return makeInt(op(x.getValue()));
+            return makeInt.execute(op(x.getValue()));
         }
 
         @Specialization(guards = "!isInteger(x)")
@@ -2618,20 +2621,6 @@ Object doGeneral(VirtualFrame frame, Object x,
             return recursiveNode.execute(frame, lib.asIndexWithFrame(x, hasFrame, frame));
         }
 
-        private Object makeInt(BigInteger i) {
-            try {
-                return PInt.intValueExact(i);
-            } catch (ArithmeticException e) {
-                // does not fit int, so try long
-            }
-            try {
-                return PInt.longValueExact(i);
-            } catch (ArithmeticException e) {
-                // does not fit long either, create PInt
-            }
-            return factory().createInt(i);
-        }
-
         @TruffleBoundary
         private static BigInteger op(BigInteger x) {
             // assumes x >= 0

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

@@ -348,7 +348,7 @@ public int intValue() {
     }
 
     @TruffleBoundary
-    private static int intValue(BigInteger value) {
+    public static int intValue(BigInteger value) {
         return value.intValue();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/NarrowBigIntegerNode.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.nodes.util;
+
+import com.oracle.graal.python.builtins.modules.MathGuards;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
+
+import java.math.BigInteger;
+
+@TypeSystemReference(PythonArithmeticTypes.class)
+@ImportStatic(MathGuards.class)
+public abstract class NarrowBigIntegerNode extends PNodeWithContext {
+
+    public abstract Object execute(BigInteger x);
+
+    @Specialization(guards = "fitsIntoInt(x)")
+    int narrowToInt(BigInteger x) {
+        return PInt.intValue(x);
+    }
+
+    @Specialization(guards = {"fitsIntoLong(x)", "!fitsIntoInt(x)"})
+    long narrowToLong(BigInteger x) {
+        return PInt.longValue(x);
+    }
+
+    @Specialization(guards = "!fitsIntoLong(x)")
+    PInt makePInt(BigInteger x,
+                    @Cached PythonObjectFactory factory) {
+        return factory.createInt(x);
+    }
+
+    @TruffleBoundary
+    static boolean fitsIntoInt(BigInteger x) {
+        return x.bitLength() <= 31;
+    }
+
+    @TruffleBoundary
+    static boolean fitsIntoLong(BigInteger x) {
+        return x.bitLength() <= 63;
+    }
+}