Add missing specialization to 'int' constructor.

Author: fangerer

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

@@ -988,21 +988,23 @@ long parseLong(Object cls, PIBytesLike arg, int keywordArg) throws NumberFormatE
             return parseLong(cls, new String(getByteArray(arg)), keywordArg);
         }
 
-        @Specialization(rewriteOn = NumberFormatException.class)
-        @TruffleBoundary
-        Object parseBytes(PythonClass cls, PIBytesLike arg, int base) {
-            return parsePInt(cls, new String(getByteArray(arg)), base);
-        }
-
-        @Specialization(replaces = "parseBytes")
-        Object parseBytesError(PythonClass cls, PIBytesLike arg, int base) {
+        @Specialization
+        Object parseBytesError(PythonClass cls, PIBytesLike arg, int base,
+                        @Cached("create()") BranchProfile errorProfile) {
             try {
-                return parseBytes(cls, arg, base);
+                return parsePInt(cls, new String(getByteArray(arg)), base);
             } catch (NumberFormatException e) {
+                errorProfile.enter();
                 throw raise(ValueError, "invalid literal for int() with base %s: %s", base, arg);
             }
         }
 
+        @Specialization(guards = "isNoValue(base)")
+        Object parseBytesError(PythonClass cls, PIBytesLike arg, @SuppressWarnings("unused") PNone base,
+                        @Cached("create()") BranchProfile errorProfile) {
+            return parseBytesError(cls, arg, 10, errorProfile);
+        }
+
         @Specialization(guards = "isPrimitiveInt(cls)", rewriteOn = NumberFormatException.class)
         int parseInt(Object cls, PString arg, int keywordArg) throws NumberFormatException {
             return parseInt(cls, arg.getValue(), keywordArg);
@@ -1019,6 +1021,11 @@ Object parsePInt(PythonClass cls, PString arg, int keywordArg) {
             return parsePInt(cls, arg.getValue(), keywordArg);
         }
 
+        @Specialization(guards = "isNoValue(base)")
+        Object parsePInt(PythonClass cls, PString arg, PNone base) {
+            return createInt(cls, arg.getValue(), base);
+        }
+
         @Specialization(guards = "isPrimitiveInt(cls)", rewriteOn = NumberFormatException.class)
         @TruffleBoundary
         int parseInt(@SuppressWarnings("unused") Object cls, String arg, int keywordArg) throws NumberFormatException {
@@ -1077,7 +1084,7 @@ Object fail(PythonClass cls, Object arg, Object keywordArg) {
             throw raise(TypeError, "int() can't convert non-string with explicit base");
         }
 
-        @Specialization(guards = {"isNoValue(keywordArg)", "!isNoValue(obj)"})
+        @Specialization(guards = {"isNoValue(keywordArg)", "!isNoValue(obj)", "!isHandledType(obj)"})
         public Object createInt(PythonClass cls, Object obj, PNone keywordArg,
                         @Cached("create(__INT__)") LookupAndCallUnaryNode callIntNode,
                         @Cached("create(__TRUNC__)") LookupAndCallUnaryNode callTruncNode,
@@ -1112,6 +1119,10 @@ public Object createInt(PythonClass cls, Object obj, PNone keywordArg,
             }
         }
 
+        protected static boolean isHandledType(Object obj) {
+            return PGuards.isInteger(obj) || obj instanceof Double || obj instanceof Boolean || PGuards.isString(obj) || PGuards.isBytes(obj);
+        }
+
         private byte[] getByteArray(PIBytesLike pByteArray) {
             if (toByteArrayNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();