Remove usages of GetRubyEncodingNode and EncodingManager#getRubyEncoding

Author: bjfish

src/main/java/org/truffleruby/core/cast/ToRubyEncodingNode.java

@@ -45,7 +45,7 @@ protected RubyEncoding symbolToEncoding(RubySymbol value) {
 
     @Specialization
     protected RubyEncoding regexpToEncoding(RubyRegexp value) {
-        return getContext().getEncodingManager().getRubyEncoding(value.regex.getEncoding());
+        return value.encoding;
     }
 
     @Specialization

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

@@ -230,10 +230,6 @@ public RubyEncoding getRubyEncoding(int encodingIndex) {
         return ENCODING_LIST_BY_ENCODING_INDEX[encodingIndex];
     }
 
-    public RubyEncoding getRubyEncoding(Encoding encoding) {
-        return ENCODING_LIST_BY_ENCODING_INDEX[encoding.getIndex()];
-    }
-
     @TruffleBoundary
     public synchronized RubyEncoding defineBuiltInEncoding(EncodingDB.Entry encodingEntry) {
         final int encodingIndex = encodingEntry.getEncoding().getIndex();
@@ -263,7 +259,7 @@ public synchronized RubyEncoding defineDynamicEncoding(Encoding encoding, byte[]
 
     @TruffleBoundary
     public RubyEncoding defineAlias(Encoding encoding, String name) {
-        final RubyEncoding rubyEncoding = getRubyEncoding(encoding);
+        final RubyEncoding rubyEncoding = Encodings.getBuiltInEncoding(encoding.getIndex());
         addToLookup(name, rubyEncoding);
         return rubyEncoding;
     }

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

@@ -29,7 +29,6 @@
 import org.truffleruby.core.cast.ToEncodingNode;
 import org.truffleruby.core.cast.ToRubyEncodingNode;
 import org.truffleruby.core.encoding.EncodingNodesFactory.CheckRopeEncodingNodeGen;
-import org.truffleruby.core.encoding.EncodingNodesFactory.GetRubyEncodingNodeGen;
 import org.truffleruby.core.encoding.EncodingNodesFactory.NegotiateCompatibleEncodingNodeGen;
 import org.truffleruby.core.encoding.EncodingNodesFactory.NegotiateCompatibleRopeEncodingNodeGen;
 import org.truffleruby.core.klass.RubyClass;
@@ -69,40 +68,6 @@ protected boolean isAsciiCompatible(RubyEncoding encoding) {
         }
     }
 
-    public abstract static class GetRubyEncodingNode extends RubyContextNode {
-
-        public static GetRubyEncodingNode create() {
-            return GetRubyEncodingNodeGen.create();
-        }
-
-        /** This returns only the built-in RubyEncoding for the given Encoding. It will not return dummy/replicate
-         * encodings that might be associated to an Encoding so this should rarely be used.
-         * 
-         * @param encoding
-         * @return a built-in RubyEncoding */
-        public abstract RubyEncoding executeGetRubyEncoding(Encoding encoding);
-
-        @Specialization(guards = "isSameEncoding(encoding, cachedRubyEncoding)", limit = "getCacheLimit()")
-        protected RubyEncoding getRubyEncodingCached(Encoding encoding,
-                @Cached("getRubyEncodingUncached(encoding)") RubyEncoding cachedRubyEncoding) {
-            return cachedRubyEncoding;
-        }
-
-        @Specialization(replaces = "getRubyEncodingCached")
-        protected RubyEncoding getRubyEncodingUncached(Encoding encoding) {
-            return Encodings.getBuiltInEncoding(encoding.getIndex());
-        }
-
-        protected boolean isSameEncoding(Encoding encoding, RubyEncoding rubyEncoding) {
-            return encoding == rubyEncoding.jcoding;
-        }
-
-        protected int getCacheLimit() {
-            return getLanguage().options.ENCODING_LOADED_CLASSES_CACHE;
-        }
-
-    }
-
     public abstract static class NegotiateCompatibleRopeEncodingNode extends RubyContextNode {
 
         public abstract RubyEncoding executeNegotiate(Rope first, RubyEncoding firstEncoding, Rope second,
@@ -472,7 +437,7 @@ protected Object eachAlias(RubyProc block) {
                 yieldNode.yield(
                         block,
                         aliasName,
-                        getContext().getEncodingManager().getRubyEncoding(entry.value.getEncoding()));
+                        Encodings.getBuiltInEncoding(entry.value.getEncoding().getIndex()));
             }
             return nil;
         }
@@ -629,8 +594,6 @@ protected int encodingFindIndex(Object nameObject,
     @Primitive(name = "encoding_get_object_encoding")
     public abstract static class EncodingGetObjectEncodingNode extends PrimitiveArrayArgumentsNode {
 
-        @Child private GetRubyEncodingNode getRubyEncodingNode = EncodingNodesFactory.GetRubyEncodingNodeGen.create();
-
         @Specialization
         protected RubyEncoding encodingGetObjectEncodingString(RubyString object) {
             return object.encoding;
@@ -657,7 +620,7 @@ protected Object encodingGetObjectEncodingRegexp(RubyRegexp object,
             final Rope regexpSource = object.source;
 
             if (hasRegexpSource.profile(regexpSource != null)) {
-                return getRubyEncodingNode.executeGetRubyEncoding(regexpSource.getEncoding());
+                return object.encoding;
             } else {
                 return Encodings.BINARY;
             }

src/main/java/org/truffleruby/core/regexp/RegexpNodes.java

@@ -26,7 +26,6 @@
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.ToStrNode;
-import org.truffleruby.core.encoding.EncodingNodes;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.klass.RubyClass;
@@ -156,10 +155,8 @@ public abstract static class SourceNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected RubyString source(RubyRegexp regexp,
-                @Cached StringNodes.MakeStringNode makeStringNode,
-                @Cached EncodingNodes.GetRubyEncodingNode getRubyEncodingNode) {
-            final RubyEncoding rubyEncoding = getRubyEncodingNode.executeGetRubyEncoding(regexp.source.encoding);
-            return makeStringNode.fromRope(regexp.source, rubyEncoding);
+                @Cached StringNodes.MakeStringNode makeStringNode) {
+            return makeStringNode.fromRope(regexp.source, regexp.encoding);
         }
 
     }
@@ -179,18 +176,14 @@ public static ToSNode create() {
         @Specialization(guards = "isSameRegexp(regexp, cachedRegexp)")
         protected RubyString toSCached(RubyRegexp regexp,
                 @Cached("regexp") RubyRegexp cachedRegexp,
-                @Cached("createRope(cachedRegexp)") Rope rope,
-                @Cached EncodingNodes.GetRubyEncodingNode getRubyEncodingNode) {
-            final RubyEncoding rubyEncoding = getRubyEncodingNode.executeGetRubyEncoding(rope.encoding);
-            return makeStringNode.fromRope(rope, rubyEncoding);
+                @Cached("createRope(cachedRegexp)") Rope rope) {
+            return makeStringNode.fromRope(rope, Encodings.getBuiltInEncoding(rope.getEncoding().getIndex()));
         }
 
         @Specialization
-        protected RubyString toS(RubyRegexp regexp,
-                @Cached EncodingNodes.GetRubyEncodingNode getRubyEncodingNode) {
+        protected RubyString toS(RubyRegexp regexp) {
             final Rope rope = createRope(regexp);
-            final RubyEncoding rubyEncoding = getRubyEncodingNode.executeGetRubyEncoding(rope.encoding);
-            return makeStringNode.fromRope(rope, rubyEncoding);
+            return makeStringNode.fromRope(rope, Encodings.getBuiltInEncoding(rope.getEncoding().getIndex()));
         }
 
         @TruffleBoundary

src/main/java/org/truffleruby/core/regexp/RubyRegexp.java

@@ -43,7 +43,7 @@ public RubyRegexp(
             RegexpOptions options,
             EncodingCache encodingCache,
             TRegexCache tregexCache) {
-        assert source.encoding == encoding.jcoding;
+        assert (source == null && encoding == null) || source.encoding == encoding.jcoding;
         this.regex = regex;
         this.source = source;
         this.encoding = encoding;