Added shortCircuitPrimitive to ConversionFactory

Author: otethal

graalpython/com.oracle.graal.python.annotations/src/com/oracle/graal/python/annotations/ArgumentClinic.java

@@ -76,9 +76,9 @@
      * types and will just pass them directly to the specializations. This does not apply to
      * primitive values that are already boxed: those are always passed to the convertor.
      * 
-     * It is not necessary to set this when using a builtin conversion. Built-in convertors provide
-     * their own list of short circuit types, which is applied if this field is set to its default
-     * value.
+     * It is not necessary to set this when using a builtin conversion or
+     * {@link #conversionClass()}. Built-in convertors and {@link ConversionFactory} provide their
+     * own list of short circuit types, which is applied if this field is set to its default value.
      */
     PrimitiveType[] shortCircuitPrimitive() default {};
 
@@ -163,6 +163,14 @@ enum ClinicConversion {
          */
         ClinicArgument[] clinicArgs() default {};
 
+        /**
+         * The boxing optimized execute method variants will not attempt to cast the listed
+         * primitive types and will just pass them directly to the specializations. This does not
+         * apply to primitive values that are already boxed: those are always passed to the
+         * convertor.
+         */
+        PrimitiveType[] shortCircuitPrimitive() default {};
+
         enum ClinicArgument {
             /**
              * The default value {@link #defaultValue()}.

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ConverterFactory.java

@@ -64,13 +64,13 @@ public class ConverterFactory {
     public final ClinicArgument[] clinicArgs;
     public final PrimitiveType[] acceptedPrimitiveTypes;
 
-    private ConverterFactory(ExecutableElement method, ClinicArgument[] clinicArgs) {
+    private ConverterFactory(ExecutableElement method, ClinicArgument[] clinicArgs, PrimitiveType[] acceptedPrimitiveTypes) {
         fullClassName = method.getEnclosingElement().toString();
         className = fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
         methodName = method.getSimpleName().toString();
         paramCount = method.getParameters().size() - clinicArgs.length;
         this.clinicArgs = clinicArgs;
-        acceptedPrimitiveTypes = new PrimitiveType[0];
+        this.acceptedPrimitiveTypes = acceptedPrimitiveTypes;
     }
 
     private ConverterFactory(String className, ClinicArgument[] clinicArgs, PrimitiveType[] acceptedPrimitiveTypes) {
@@ -150,7 +150,7 @@ public static ConverterFactory getForClass(TypeElement conversionClass) throws P
                 if (factory != null) {
                     throw new ProcessingError(conversionClass, "Multiple ConversionFactory annotations in a single class.");
                 }
-                factory = new ConverterFactory((ExecutableElement) e, annot.clinicArgs());
+                factory = new ConverterFactory((ExecutableElement) e, annot.clinicArgs(), annot.shortCircuitPrimitive());
             }
         }
         if (factory == null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleBuiltins.java

@@ -135,16 +135,16 @@ int doOthers(VirtualFrame frame, Object value,
             throw raise(TypeError, ErrorMessages.SLICE_INDICES_TYPE_ERROR);
         }
 
-        @ArgumentClinic.ConversionFactory(clinicArgs = {ArgumentClinic.ConversionFactory.ClinicArgument.DefaultValue})
+        @ArgumentClinic.ConversionFactory(shortCircuitPrimitive = PrimitiveType.Int, clinicArgs = {ArgumentClinic.ConversionFactory.ClinicArgument.DefaultValue})
         public static SliceIndexNode create(int defaultValue) {
             return SliceIndexNodeGen.create(defaultValue);
         }
     }
 
     // index(element)
     @Builtin(name = "index", minNumOfPositionalArgs = 2, parameterNames = {"$self", "value", "start", "stop"})
-    @ArgumentClinic(name = "start", conversionClass = SliceIndexNode.class, defaultValue = "0", shortCircuitPrimitive = PrimitiveType.Int)
-    @ArgumentClinic(name = "stop", conversionClass = SliceIndexNode.class, defaultValue = "Integer.MAX_VALUE", shortCircuitPrimitive = PrimitiveType.Int)
+    @ArgumentClinic(name = "start", conversionClass = SliceIndexNode.class, defaultValue = "0")
+    @ArgumentClinic(name = "stop", conversionClass = SliceIndexNode.class, defaultValue = "Integer.MAX_VALUE")
     @TypeSystemReference(PythonArithmeticTypes.class)
     @ImportStatic(MathGuards.class)
     @GenerateNodeFactory