[GR-30852] Add RubyEncoding field to RubyRegexp

PullRequest: truffleruby/2816

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/encoding/Encodings.java

@@ -16,6 +16,7 @@
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB;
 import org.jcodings.specific.ASCIIEncoding;
+import org.jcodings.specific.ISO8859_1Encoding;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF16BEEncoding;
 import org.jcodings.specific.UTF16LEEncoding;
@@ -43,6 +44,7 @@ public class Encodings {
     public static final RubyEncoding UTF16BE = BUILT_IN_ENCODINGS[UTF16BEEncoding.INSTANCE.getIndex()];
     public static final RubyEncoding UTF32LE = BUILT_IN_ENCODINGS[UTF32LEEncoding.INSTANCE.getIndex()];
     public static final RubyEncoding UTF32BE = BUILT_IN_ENCODINGS[UTF32BEEncoding.INSTANCE.getIndex()];
+    public static final RubyEncoding ISO_8859_1 = BUILT_IN_ENCODINGS[ISO8859_1Encoding.INSTANCE.getIndex()];
     public static final RubyEncoding UTF16_DUMMY = BUILT_IN_ENCODINGS[EncodingDB
             .getEncodings()
             .get(RopeOperations.encodeAsciiBytes("UTF-16"))