[GR-25948] Remove unneeded ReportPolymorphism

PullRequest: truffleruby/2192

Author: eregon

src/main/java/org/truffleruby/cext/IDToSymbolNode.java

@@ -38,7 +38,7 @@ public static IDToSymbolNode create() {
     }
 
     @Specialization(guards = "isStaticSymbol(value)")
-    protected Object unwrapStaticUncached(long value,
+    protected Object unwrapStaticSymbol(long value,
             @CachedLanguage RubyLanguage language,
             @CachedContext(RubyLanguage.class) RubyContext context,
             @Cached BranchProfile errorProfile) {
@@ -56,7 +56,7 @@ protected Object unwrapStaticUncached(long value,
     }
 
     @Specialization(guards = "!isStaticSymbol(value)")
-    protected Object unwrapObject(Object value,
+    protected Object unwrapDynamicSymbol(Object value,
             @Cached UnwrapNode unwrapNode) {
         return unwrapNode.execute(value);
     }

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -455,7 +455,6 @@ protected int normalize(int arraySize, int index,
     }
 
     @CoreMethod(names = "clear", raiseIfFrozenSelf = true)
-    @ReportPolymorphism
     public abstract static class ClearNode extends ArrayCoreMethodNode {
 
         @Specialization

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

@@ -58,31 +58,17 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
-import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreModule(value = "Encoding", isClass = true)
 public abstract class EncodingNodes {
 
-    @ReportPolymorphism
     @CoreMethod(names = "ascii_compatible?")
     public abstract static class AsciiCompatibleNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization(guards = "encoding == cachedEncoding", limit = "getIdentityCacheLimit()")
-        protected boolean isAsciiCompatibleCached(RubyEncoding encoding,
-                @Cached("encoding") RubyEncoding cachedEncoding,
-                @Cached("isAsciiCompatible(cachedEncoding)") boolean isAsciiCompatible) {
-            return isAsciiCompatible;
-        }
-
-        @Specialization(replaces = "isAsciiCompatibleCached")
-        protected boolean isAsciiCompatibleUncached(RubyEncoding encoding) {
-            return isAsciiCompatible(encoding);
-        }
-
-        protected static boolean isAsciiCompatible(RubyEncoding encoding) {
+        @Specialization
+        protected boolean isAsciiCompatible(RubyEncoding encoding) {
             return encoding.encoding.isAsciiCompatible();
         }
     }
@@ -432,32 +418,20 @@ protected ImmutableRubyString localeCharacterMap(
         }
     }
 
-    @ReportPolymorphism
     @CoreMethod(names = "dummy?")
     public abstract static class DummyNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization(guards = "encoding == cachedEncoding", limit = "getIdentityCacheLimit()")
-        protected boolean isDummyCached(RubyEncoding encoding,
-                @Cached("encoding") RubyEncoding cachedEncoding,
-                @Cached("isDummyUncached(cachedEncoding)") boolean isDummy) {
-            return isDummy;
-        }
-
-        @Specialization(replaces = "isDummyCached")
-        protected boolean isDummyUncached(RubyEncoding encoding) {
+        @Specialization
+        protected boolean isDummy(RubyEncoding encoding) {
             return encoding.encoding.isDummy();
         }
-
     }
 
     @CoreMethod(names = { "name", "to_s" })
     public abstract static class ToSNode extends CoreMethodArrayArgumentsNode {
-
         @Specialization
         protected ImmutableRubyString toS(RubyEncoding encoding) {
             return encoding.name;
         }
-
     }
 
     @CoreMethod(names = { "__allocate__", "__layout_allocate__" }, constructor = true, visibility = Visibility.PRIVATE)
@@ -494,12 +468,10 @@ protected Object eachAlias(RubyProc block) {
 
     @Primitive(name = "encoding_is_unicode")
     public abstract static class IsUnicodeNode extends PrimitiveArrayArgumentsNode {
-
         @Specialization
         protected boolean isUnicode(RubyEncoding encoding) {
             return encoding.encoding.isUnicode();
         }
-
     }
 
     @Primitive(name = "get_actual_encoding")
@@ -759,22 +731,18 @@ private RubyEncoding createDummy(String name) {
 
     @Primitive(name = "encoding_get_encoding_by_index", lowerFixnum = 0)
     public static abstract class GetEncodingObjectByIndexNode extends PrimitiveArrayArgumentsNode {
-
         @Specialization
         protected RubyEncoding getEncoding(int index) {
             return getContext().getEncodingManager().getRubyEncoding(index);
         }
-
     }
 
     @Primitive(name = "encoding_get_encoding_index")
     public static abstract class GetEncodingIndexNode extends PrimitiveArrayArgumentsNode {
-
         @Specialization
         protected int getIndex(RubyEncoding encoding) {
             return encoding.encoding.getIndex();
         }
-
     }
 
     public static abstract class CheckRopeEncodingNode extends RubyContextNode {

test/truffle/compiler/pe/core/encoding_pe.rb

@@ -6,12 +6,6 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-example "Encoding::US_ASCII.ascii_compatible?", true
-example "Encoding::UTF_16BE.ascii_compatible?", false
-
-example "Encoding::ISO_2022_JP.dummy?", true
-example "Encoding::UTF_8.dummy?", false
-
 example "Encoding.compatible?('abc', 'def')", Encoding::UTF_8
 example "Encoding.compatible?(Encoding::UTF_8, Encoding::US_ASCII)", Encoding::UTF_8
 example "Encoding.compatible?(Encoding::UTF_8, Encoding::ASCII_8BIT)", nil