Remove outdated, and now unnecessary, SVM-specific parse operations.

PullRequest: truffleruby/703

Author: nirvdrum

src/main/java/org/truffleruby/RubyContext.java

@@ -89,8 +89,6 @@
 
 public class RubyContext {
 
-    public static RubyContext FIRST_INSTANCE = null;
-
     private final RubyLanguage language;
     @CompilationFinal private TruffleLanguage.Env env;
 
@@ -156,10 +154,6 @@ public class RubyContext {
     public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
         Metrics.printTime("before-context-constructor");
 
-        if (FIRST_INSTANCE == null) {
-            FIRST_INSTANCE = this;
-        }
-
         this.preInitializing = preInitializeContexts;
         RubyContext.preInitializeContexts = false; // Only the first context is pre-initialized
         this.preInitialized = preInitializing;

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

@@ -10,48 +10,19 @@
 package org.truffleruby.parser.parser;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleOptions;
 import org.jcodings.Encoding;
-import org.truffleruby.RubyContext;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeNodes;
-import org.truffleruby.core.rope.RopeOperations;
 import org.truffleruby.language.RubyBaseNode;
-import java.util.Arrays;
-import static org.truffleruby.core.rope.CodeRange.CR_7BIT;
-import static org.truffleruby.core.rope.CodeRange.CR_UNKNOWN;
 
 public class ParserRopeOperations {
 
     public Rope withEncoding(Rope rope, Encoding encoding) {
-        if (isBuildingNativeImage()) {
-            if (rope.isAsciiOnly() && encoding.isAsciiCompatible()) {
-                return rope.withEncoding(encoding, CR_7BIT);
-            }
-
-            return RopeOperations.create(rope.getBytes(), encoding, CR_UNKNOWN);
-        } else {
-            return ropeNode.getWithEncodingNode().executeWithEncoding(rope, encoding);
-        }
+        return ropeNode.getWithEncodingNode().executeWithEncoding(rope, encoding);
     }
 
     public Rope makeShared(Rope rope, int sharedStart, int sharedLength) {
-        if (isBuildingNativeImage()) {
-            if (sharedLength == rope.byteLength()) {
-                return rope;
-            }
-
-            return RopeOperations.create(Arrays.copyOfRange(rope.getBytes(), sharedStart, sharedStart + sharedLength), rope.getEncoding(), rope.isAsciiOnly() ? CR_7BIT : CR_UNKNOWN);
-        } else {
-            return ropeNode.getSubstringNode().executeSubstring(rope, sharedStart, sharedLength);
-        }
-    }
-
-    private static boolean isBuildingNativeImage() {
-        // We can't use a detached RopeNode during image construction because it trips up the static analysis, but
-        // we can use it at runtime. We check if a context has been created as a proxy for whether we're in the native
-        // image builder or running at runtime.
-        return TruffleOptions.AOT && RubyContext.FIRST_INSTANCE == null;
+        return ropeNode.getSubstringNode().executeSubstring(rope, sharedStart, sharedLength);
     }
 
     private static class RopeNode extends RubyBaseNode {
@@ -79,6 +50,6 @@ public RopeNodes.WithEncodingNode getWithEncodingNode() {
 
     }
 
-    private final RopeNode ropeNode = isBuildingNativeImage() ? null : new RopeNode();
+    private final RopeNode ropeNode = new RopeNode();
 
 }