Fix native-image compilation

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/BuiltinMethodDescriptor.java

@@ -151,6 +151,7 @@ private static Builtin findBuiltinAnnotation(String name, NodeFactory<? extends
     // Name and isReverseOperation are shortcuts for builtinAnnotation.name()/reverseOperation()
     private final String name;
     private final boolean isReverseOperation;
+    private final int minNumOfPositionalArgs;
 
     private BuiltinMethodDescriptor(String name, NodeFactory<? extends PythonBuiltinBaseNode> factory, PythonBuiltinClassType type, Builtin builtinAnnotation) {
         assert name.equals(builtinAnnotation.name());
@@ -159,6 +160,7 @@ private BuiltinMethodDescriptor(String name, NodeFactory<? extends PythonBuiltin
         this.type = type;
         this.builtinAnnotation = builtinAnnotation;
         this.isReverseOperation = builtinAnnotation.reverseOperation();
+        this.minNumOfPositionalArgs = builtinAnnotation.minNumOfPositionalArgs();
     }
 
     protected final NodeFactory<? extends PythonBuiltinBaseNode> getFactory() {
@@ -191,6 +193,10 @@ public final boolean isReverseOperation() {
         return isReverseOperation;
     }
 
+    public final int minNumOfPositionalArgs() {
+        return minNumOfPositionalArgs;
+    }
+
     public final Builtin getBuiltinAnnotation() {
         return builtinAnnotation;
     }

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

@@ -100,7 +100,7 @@ static Object callBinarySpecialMethodSlotInlined(VirtualFrame frame, @SuppressWa
     }
 
     protected static boolean hasAllowedArgsNum(BuiltinMethodDescriptor descr) {
-        return descr.getBuiltinAnnotation().minNumOfPositionalArgs() <= 2;
+        return descr.minNumOfPositionalArgs() <= 2;
     }
 
     @Specialization(guards = "cachedInfo == info", limit = "getCallSiteInlineCacheMaxDepth()")

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

@@ -246,6 +246,6 @@ protected void raiseInvalidArgsNumUncached(boolean hasValidArgsNum, BuiltinMetho
 
     @TruffleBoundary
     private void raiseInvalidArgsNumUncached(BuiltinMethodDescriptor descr) {
-        throw PRaiseNode.raiseUncached(this, PythonBuiltinClassType.TypeError, EXPECTED_D_ARGS, descr.getBuiltinAnnotation().minNumOfPositionalArgs());
+        throw PRaiseNode.raiseUncached(this, PythonBuiltinClassType.TypeError, EXPECTED_D_ARGS, descr.minNumOfPositionalArgs());
     }
 }

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

@@ -92,9 +92,8 @@ Object callUnarySpecialMethodSlotInlined(VirtualFrame frame, @SuppressWarnings("
         return node.execute(frame, receiver);
     }
 
-    @TruffleBoundary(allowInlining = true)
     protected static boolean hasAllowedArgsNum(BuiltinMethodDescriptor descr) {
-        return descr.getBuiltinAnnotation().minNumOfPositionalArgs() <= 1;
+        return descr.minNumOfPositionalArgs() <= 1;
     }
 
     @Specialization(guards = "cachedInfo == info", limit = "getCallSiteInlineCacheMaxDepth()")