Use the right node in formatting ints

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberCheckNode.java

@@ -66,6 +66,10 @@
 public abstract class PyNumberCheckNode extends PNodeWithContext {
     public abstract boolean execute(Node inliningTarget, Object object);
 
+    public static boolean executeUncached(Object object) {
+        return PyNumberCheckNodeGen.getUncached().execute(null, object);
+    }
+
     @Specialization
     static boolean doString(@SuppressWarnings("unused") TruffleString object) {
         return false;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberIndexNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -86,6 +86,10 @@
 public abstract class PyNumberIndexNode extends PNodeWithContext {
     public abstract Object execute(Frame frame, Node inliningTarget, Object object);
 
+    public static Object executeUncached(Object object) {
+        return PyNumberIndexNodeGen.getUncached().execute(null, null, object);
+    }
+
     @Specialization
     static int doInt(int object) {
         return object;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FormatProcessor.java

@@ -6,9 +6,6 @@
  */
 package com.oracle.graal.python.runtime.formatting;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___INDEX__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___INT__;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.MemoryError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
@@ -20,12 +17,12 @@
 
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.lib.PyFloatAsDoubleNode;
+import com.oracle.graal.python.lib.PyNumberCheckNode;
+import com.oracle.graal.python.lib.PyNumberIndexNode;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -190,20 +187,18 @@ protected final Object asNumber(Object arg, char specType) {
         } else if (arg instanceof Boolean) {
             // Fast path for simple booleans
             return (Boolean) arg ? 1 : 0;
-        } else if (arg instanceof PythonAbstractObject) {
-            // Try again with arg.__int__() or __index__() depending on the spec type
+        } else if (PyNumberCheckNode.executeUncached(arg)) {
             try {
-                TruffleString magicName = useIndexMagicMethod(specType) ? T___INDEX__ : T___INT__;
-                Object attribute = lookupAttribute(arg, magicName);
-                if (!(attribute instanceof PNone)) {
-                    return call(attribute, arg);
+                if (useIndexMagicMethod(specType)) {
+                    return PyNumberIndexNode.executeUncached(arg);
+                } else {
+                    return CallNode.executeUncached(PythonBuiltinClassType.PInt, arg);
                 }
             } catch (PException e) {
-                e.expectUncached(AttributeError);
-                // No __int__/__index__ defined (at Python level)
+                e.expectUncached(TypeError);
             }
         }
-        return arg;
+        return null;
     }
 
     protected double asFloat(Object arg) {