Remove generic int/long specializations and report polymorphism.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -149,6 +149,7 @@
 import com.oracle.truffle.api.dsl.GeneratedBy;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.Frame;
@@ -317,6 +318,7 @@ public static FromNativeSubclassNode create() {
 
     // -----------------------------------------------------------------------------------------------------------------
     @GenerateUncached
+    @ReportPolymorphism
     @ImportStatic({PGuards.class, CApiGuards.class})
     public abstract static class ToSulongNode extends CExtToNativeNode {
 
@@ -351,20 +353,11 @@ static PrimitiveNativeWrapper doIntegerSmall(@SuppressWarnings("unused") CExtCon
             return PrimitiveNativeWrapper.createInt(i);
         }
 
-        @Specialization(guards = "!isSmallInteger(i)", replaces = "doIntegerSmall")
+        @Specialization(guards = "!isSmallInteger(i)")
         static PrimitiveNativeWrapper doInteger(@SuppressWarnings("unused") CExtContext cextContext, int i) {
             return PrimitiveNativeWrapper.createInt(i);
         }
 
-        @Specialization(replaces = {"doIntegerSmall", "doInteger"})
-        static PrimitiveNativeWrapper doIntegerGeneric(@SuppressWarnings("unused") CExtContext cextContext, int i,
-                        @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
-            if (CApiGuards.isSmallInteger(i)) {
-                return doIntegerSmall(cextContext, i, contextRef);
-            }
-            return PrimitiveNativeWrapper.createInt(i);
-        }
-
         @Specialization(guards = "isSmallLong(l)")
         static PrimitiveNativeWrapper doLongSmall(@SuppressWarnings("unused") CExtContext cextContext, long l,
                         @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
@@ -375,20 +368,11 @@ static PrimitiveNativeWrapper doLongSmall(@SuppressWarnings("unused") CExtContex
             return PrimitiveNativeWrapper.createLong(l);
         }
 
-        @Specialization(guards = "!isSmallLong(l)", replaces = "doLongSmall")
+        @Specialization(guards = "!isSmallLong(l)")
         static PrimitiveNativeWrapper doLong(@SuppressWarnings("unused") CExtContext cextContext, long l) {
             return PrimitiveNativeWrapper.createLong(l);
         }
 
-        @Specialization(replaces = {"doLongSmall", "doLong"})
-        static PrimitiveNativeWrapper doLongGeneric(@SuppressWarnings("unused") CExtContext cextContext, long l,
-                        @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
-            if (CApiGuards.isSmallLong(l)) {
-                return doLongSmall(cextContext, l, contextRef);
-            }
-            return PrimitiveNativeWrapper.createLong(l);
-        }
-
         @Specialization(guards = "!isNaN(d)")
         static Object doDouble(@SuppressWarnings("unused") CExtContext cextContext, double d) {
             return PrimitiveNativeWrapper.createDouble(d);
@@ -548,6 +532,7 @@ public static ToSulongNode getUncached() {
      */
     @GenerateUncached
     @ImportStatic({PGuards.class, CApiGuards.class})
+    @ReportPolymorphism
     public abstract static class ToNewRefNode extends CExtToNativeNode {
 
         public final Object executeInt(int i) {
@@ -597,20 +582,11 @@ static PrimitiveNativeWrapper doIntegerSmall(@SuppressWarnings("unused") CExtCon
             return PrimitiveNativeWrapper.createInt(i);
         }
 
-        @Specialization(guards = "!isSmallInteger(i)", replaces = "doIntegerSmall")
+        @Specialization(guards = "!isSmallInteger(i)")
         static PrimitiveNativeWrapper doInteger(@SuppressWarnings("unused") CExtContext cextContext, int i) {
             return PrimitiveNativeWrapper.createInt(i);
         }
 
-        @Specialization(replaces = {"doIntegerSmall", "doInteger"})
-        static PrimitiveNativeWrapper doIntegerGeneric(CExtContext cextContext, int i,
-                        @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
-            if (CApiGuards.isSmallInteger(i)) {
-                return doIntegerSmall(cextContext, i, contextRef);
-            }
-            return PrimitiveNativeWrapper.createInt(i);
-        }
-
         @Specialization(guards = "isSmallLong(l)")
         static PrimitiveNativeWrapper doLongSmall(@SuppressWarnings("unused") CExtContext cextContext, long l,
                         @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
@@ -623,20 +599,11 @@ static PrimitiveNativeWrapper doLongSmall(@SuppressWarnings("unused") CExtContex
             return PrimitiveNativeWrapper.createLong(l);
         }
 
-        @Specialization(guards = "!isSmallLong(l)", replaces = "doLongSmall")
+        @Specialization(guards = "!isSmallLong(l)")
         static PrimitiveNativeWrapper doLong(@SuppressWarnings("unused") CExtContext cextContext, long l) {
             return PrimitiveNativeWrapper.createLong(l);
         }
 
-        @Specialization(replaces = {"doLongSmall", "doLong"})
-        static PrimitiveNativeWrapper doLongGeneric(CExtContext cextContext, long l,
-                        @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
-            if (CApiGuards.isSmallLong(l)) {
-                return doLongSmall(cextContext, l, contextRef);
-            }
-            return PrimitiveNativeWrapper.createLong(l);
-        }
-
         @Specialization(guards = "!isNaN(d)")
         static Object doDouble(CExtContext cextContext, double d) {
             return ToSulongNode.doDouble(cextContext, d);
@@ -811,34 +778,22 @@ static PrimitiveNativeWrapper doIntegerSmall(CExtContext cextContext, int i,
             return ToNewRefNode.doIntegerSmall(cextContext, i, contextRef);
         }
 
-        @Specialization(guards = "!isSmallInteger(i)", replaces = "doIntegerSmall")
+        @Specialization(guards = "!isSmallInteger(i)")
         static PrimitiveNativeWrapper doInteger(CExtContext cextContext, int i) {
             return ToNewRefNode.doInteger(cextContext, i);
         }
 
-        @Specialization(replaces = {"doIntegerSmall", "doInteger"})
-        static PrimitiveNativeWrapper doIntegerGeneric(CExtContext cextContext, int i,
-                        @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
-            return ToNewRefNode.doIntegerGeneric(cextContext, i, contextRef);
-        }
-
         @Specialization(guards = "isSmallLong(l)")
         static PrimitiveNativeWrapper doLongSmall(CExtContext cextContext, long l,
                         @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
             return ToNewRefNode.doLongSmall(cextContext, l, contextRef);
         }
 
-        @Specialization(guards = "!isSmallLong(l)", replaces = "doLongSmall")
+        @Specialization(guards = "!isSmallLong(l)")
         static PrimitiveNativeWrapper doLong(@SuppressWarnings("unused") CExtContext cextContext, long l) {
             return ToNewRefNode.doLong(cextContext, l);
         }
 
-        @Specialization(replaces = {"doLongSmall", "doLong"})
-        static PrimitiveNativeWrapper doLongGeneric(CExtContext cextContext, long l,
-                        @Shared("contextRef") @CachedContext(PythonLanguage.class) ContextReference<PythonContext> contextRef) {
-            return ToNewRefNode.doLongGeneric(cextContext, l, contextRef);
-        }
-
         @Specialization(guards = "!isNaN(d)")
         static Object doDouble(CExtContext cextContext, double d) {
             return ToSulongNode.doDouble(cextContext, d);