Remove duplicate preprocess for static Regexp literals

Author: eregon

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

@@ -951,22 +951,8 @@ public static void appendRegexpString(TStringBuilder to, TStringWithEncoding ful
     // Code that used to be in ParserSupport but copied here as ParserSupport is coupled with the JRuby lexer & parser.
     // Needed until https://github.com/ruby/prism/issues/1997 is fixed.
 
-    // From ParserSupport#newRegexpNode
-    public static TStringWithEncoding findEncodingForRegexpLiteral(TStringWithEncoding regexp, RegexpOptions options,
-            RubyEncoding lexerEncoding, Node currentNode) throws DeferredRaiseException {
-        return regexpFragmentCheck(regexp, options, lexerEncoding, currentNode);
-    }
-
-    // MRI: reg_fragment_check
-    public static TStringWithEncoding regexpFragmentCheck(TStringWithEncoding value, RegexpOptions options,
-            RubyEncoding lexerEncoding, Node currentNode) throws DeferredRaiseException {
-        final TStringWithEncoding strEnc = setRegexpEncoding(value, options, lexerEncoding, currentNode);
-        ClassicRegexp.preprocessCheck(strEnc);
-        return strEnc;
-    }
-
     // MRI: reg_fragment_setenc_gen
-    private static TStringWithEncoding setRegexpEncoding(TStringWithEncoding value, RegexpOptions options,
+    public static TStringWithEncoding setRegexpEncoding(TStringWithEncoding value, RegexpOptions options,
             RubyEncoding lexerEncoding, Node currentNode) throws DeferredRaiseException {
         options = options.setup();
         final RubyEncoding optionsEncoding = options.getEncoding() == null

src/main/java/org/truffleruby/parser/YARPTranslator.java

@@ -2325,10 +2325,11 @@ public RubyNode visitInterpolatedMatchLastLineNode(Nodes.InterpolatedMatchLastLi
     @Override
     public RubyNode visitInterpolatedRegularExpressionNode(Nodes.InterpolatedRegularExpressionNode node) {
         var encodingAndOptions = getRegexpEncodingAndOptions(new Nodes.RegularExpressionFlags(node.flags));
+        var options = encodingAndOptions.options;
         final ToSNode[] children = translateInterpolatedParts(node.parts);
 
         final RubyEncoding encoding;
-        if (!encodingAndOptions.options.isKcodeDefault()) { // explicit encoding
+        if (!options.isKcodeDefault()) { // explicit encoding
             encoding = encodingAndOptions.encoding;
         } else {
             // use BINARY explicitly probably because forcing encoding isn't implemented yet in Prism
@@ -2341,15 +2342,16 @@ public RubyNode visitInterpolatedRegularExpressionNode(Nodes.InterpolatedRegular
             if (child.getValueNode() instanceof StringLiteralNode stringLiteralNode) {
                 var fragment = new TStringWithEncoding(stringLiteralNode.getTString(), stringLiteralNode.getEncoding());
                 try {
-                    ClassicRegexp.regexpFragmentCheck(fragment, encodingAndOptions.options, sourceEncoding,
-                            currentNode);
+                    // MRI: reg_fragment_check
+                    var strEnc = ClassicRegexp.setRegexpEncoding(fragment, options, sourceEncoding, currentNode);
+                    ClassicRegexp.preprocessCheck(strEnc);
                 } catch (DeferredRaiseException dre) {
                     throw regexpErrorToSyntaxError(dre, node);
                 }
             }
         }
 
-        RubyNode rubyNode = new InterpolatedRegexpNode(children, encoding, encodingAndOptions.options);
+        RubyNode rubyNode = new InterpolatedRegexpNode(children, encoding, options);
 
         if (node.isOnce()) {
             rubyNode = new OnceNode(rubyNode);
@@ -2892,17 +2894,17 @@ public RubyNode visitRedoNode(Nodes.RedoNode node) {
     public RubyNode visitRegularExpressionNode(Nodes.RegularExpressionNode node) {
         var encodingAndOptions = getRegexpEncodingAndOptions(new Nodes.RegularExpressionFlags(node.flags));
         var encoding = encodingAndOptions.encoding;
+        var options = encodingAndOptions.options;
         var source = TruffleString.fromByteArrayUncached(node.unescaped, encoding.tencoding, false);
         var sourceWithEnc = new TStringWithEncoding(source, encoding);
 
         final RubyRegexp regexp;
         try {
             // Needed until https://github.com/ruby/prism/issues/1997 is fixed
-            sourceWithEnc = ClassicRegexp.findEncodingForRegexpLiteral(sourceWithEnc, encodingAndOptions.options,
-                    sourceEncoding, currentNode);
+            sourceWithEnc = ClassicRegexp.setRegexpEncoding(sourceWithEnc, options, sourceEncoding, currentNode);
 
             regexp = RubyRegexp.create(language, sourceWithEnc.tstring, sourceWithEnc.encoding,
-                    encodingAndOptions.options, currentNode);
+                    options, currentNode);
         } catch (DeferredRaiseException dre) {
             throw regexpErrorToSyntaxError(dre, node);
         }