jruby · Oct 26, 2014 · Oct 26, 2014 · Oct 26, 2014 · Oct 26, 2014
diff --git a/core/src/main/java/org/jruby/lexer/yacc/TruffleSourcePosition.java b/core/src/main/java/org/jruby/lexer/yacc/TruffleSourcePosition.java
diff --git a/core/src/main/java/org/jruby/lexer/yacc/TruffleSourcePositionFactory.java b/core/src/main/java/org/jruby/lexer/yacc/TruffleSourcePositionFactory.java
diff --git a/core/src/main/java/org/jruby/parser/Parser.java b/core/src/main/java/org/jruby/parser/Parser.java
@@ -42,7 +42,6 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.LoadServiceResourceInputStream;
 import org.jruby.util.ByteList;
-import org.jruby.util.cli.Options;
 
 /**
  * Serves as a simple facade for all the parsing magic.
@@ -75,7 +74,7 @@ public Node parse(String file, ByteList content, DynamicScope blockScope,
     public Node parse(String file, byte[] content, DynamicScope blockScope,
             ParserConfiguration configuration) {
         RubyArray list = getLines(configuration, runtime, file);
-        LexerSource lexerSource = LexerSource.getSource(file, content, list, configuration, getSourcePositionFactoryFactory());
+        LexerSource lexerSource = LexerSource.getSource(file, content, list, configuration, new SimpleSourcePositionFactory.Factory());
         return parse(file, lexerSource, blockScope, configuration);
     }
 
@@ -86,7 +85,7 @@ public Node parse(String file, InputStream content, DynamicScope blockScope,
         if (content instanceof LoadServiceResourceInputStream) {
             return parse(file, ((LoadServiceResourceInputStream) content).getBytes(), blockScope, configuration);
         } else {
-            LexerSource lexerSource = LexerSource.getSource(file, content, list, configuration, getSourcePositionFactoryFactory());
+            LexerSource lexerSource = LexerSource.getSource(file, content, list, configuration, new SimpleSourcePositionFactory.Factory());
             return parse(file, lexerSource, blockScope, configuration);
         }
     }
@@ -174,14 +173,4 @@ private RubyArray getLines(ParserConfiguration configuration, Ruby runtime, Stri
         return list;
     }
 
-    // I'm really sorry, this is a factory factory factory method (CS)
-    private SourcePositionFactory.SourcePositionFactoryFactory getSourcePositionFactoryFactory() {
-        if (runtime.getInstanceConfig().getCompileMode() == RubyInstanceConfig.CompileMode.TRUFFLE || Options.PARSER_ALWAYS_TRUFFLE_POSITIONS.load()) {
-            return new TruffleSourcePositionFactory.Factory();
-        } else {
-            return new SimpleSourcePositionFactory.Factory();
-        }
-    }
-
-
 }
diff --git a/core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java b/core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
@@ -20,12 +20,14 @@
 import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.core.*;
 import org.jruby.truffle.nodes.methods.MethodDefinitionNode;
+import org.jruby.truffle.runtime.DebugOperations;
 import org.jruby.truffle.runtime.core.*;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyArray;
 import org.jruby.truffle.runtime.util.Supplier;
 import org.jruby.truffle.translator.TranslatorDriver;
+import org.jruby.util.cli.Options;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -48,7 +50,7 @@ public TruffleBridgeImpl(org.jruby.Ruby runtime) {
 
     @Override
     public void init() {
-        if (RubyContext.PRINT_RUNTIME) {
+        if (Options.TRUFFLE_PRINT_RUNTIME.load()) {
             runtime.getInstanceConfig().getError().println("jruby: using " + Truffle.getRuntime().getName());
         }
 
@@ -154,6 +156,7 @@ public Object get() {
 
                 final RubyRootNode parsedRootNode = truffleContext.getTranslator().parse(truffleContext, source, parserContext, parentFrame, null);
                 final CallTarget callTarget = Truffle.getRuntime().createCallTarget(parsedRootNode);
+
                 return callTarget.call(RubyArguments.pack(null, parentFrame, self, null, new Object[]{}));
             }
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
@@ -25,7 +25,6 @@
 import org.jruby.truffle.runtime.core.RubyArray;
 import org.jruby.truffle.runtime.methods.*;
 import org.jruby.truffle.runtime.util.ArrayUtils;
-import org.jruby.truffle.runtime.LexicalScope;
 
 import java.util.Arrays;
 
@@ -86,9 +85,6 @@ public Object execute(VirtualFrame frame) {
         final Object[] argumentsObjects = executeArguments(frame);
         final RubyProc blockObject = executeBlock(frame);
 
-        assert RubyContext.shouldObjectBeVisible(receiverObject);
-        assert RubyContext.shouldObjectsBeVisible(argumentsObjects);
-
         return dispatchHead.call(frame, receiverObject, methodName, blockObject, argumentsObjects);
     }
 
@@ -106,7 +102,6 @@ private Object[] executeArguments(VirtualFrame frame) {
 
         for (int i = 0; i < arguments.length; i++) {
             argumentsObjects[i] = arguments[i].execute(frame);
-            assert RubyContext.shouldObjectBeVisible(argumentsObjects[i]) : argumentsObjects[i].getClass();
         }
 
         if (isSplatted) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
@@ -13,15 +13,19 @@
 import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.nodes.*;
+import org.jruby.truffle.runtime.DebugOperations;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.methods.SharedMethodInfo;
+import org.jruby.util.cli.Options;
 
 /**
  * The root node in an AST for a method. Unlike {@link RubyNode}, this has a single entry point,
  * {@link #execute}, which Truffle knows about and can create a {@link CallTarget} from.
  */
 public class RubyRootNode extends RootNode {
 
+    public static final boolean COMPILER_PASS_LOOPS_THROUGH_BLOCKS = Options.TRUFFLE_COMPILER_PASS_LOOPS_THROUGH_BLOCKS.load();
+
     private final RubyContext context;
     private final SharedMethodInfo sharedMethodInfo;
     @Child protected RubyNode body;
@@ -42,9 +46,7 @@ public RubyRootNode cloneRubyRootNode() {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final Object result = body.execute(frame);
-        assert RubyContext.shouldObjectBeVisible(result) : getSourceSection();
-        return result;
+        return body.execute(frame);
     }
 
     @Override
@@ -60,7 +62,7 @@ public boolean isSplittable() {
     public void reportLoopCountThroughBlocks(final int count) {
         CompilerAsserts.neverPartOfCompilation();
 
-        if (RubyContext.COMPILER_PASS_LOOPS_THROUGH_BLOCKS) {
+        if (COMPILER_PASS_LOOPS_THROUGH_BLOCKS) {
             Truffle.getRuntime().iterateFrames(new FrameInstanceVisitor<Object>() {
 
                 @Override

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayAllocationSite.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayAllocationSite.java
@@ -13,22 +13,25 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.util.cli.Options;
 
 public class ArrayAllocationSite {
 
+    public static final boolean ARRAYS_OPTIMISTIC_LONG = Options.TRUFFLE_ARRAYS_OPTIMISTIC_LONG.load();
+
     @CompilerDirectives.CompilationFinal private boolean convertedIntToLong = false;
     private final Assumption assumption = Truffle.getRuntime().createAssumption();
 
     @CompilerDirectives.SlowPath
     public void convertedIntToLong() {
-        if (RubyContext.ARRAYS_OPTIMISTIC_LONG) {
+        if (ARRAYS_OPTIMISTIC_LONG) {
             convertedIntToLong = true;
             assumption.invalidate();
         }
     }
 
     public boolean hasConvertedIntToLong() {
-        if (RubyContext.ARRAYS_OPTIMISTIC_LONG) {
+        if (ARRAYS_OPTIMISTIC_LONG) {
             assumption.isValid();
             return convertedIntToLong;
         } else {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayBuilderNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayBuilderNode.java
@@ -14,6 +14,7 @@
 import org.jruby.truffle.runtime.core.RubyArray;
 import org.jruby.truffle.runtime.util.ArrayUtils;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.util.cli.Options;
 
 import java.util.Arrays;
 
@@ -24,6 +25,8 @@
 
 public abstract class ArrayBuilderNode extends Node {
 
+    public static final int ARRAYS_UNINITIALIZED_SIZE = Options.TRUFFLE_ARRAYS_UNINITIALIZED_SIZE.load();
+
     private final RubyContext context;
 
     public ArrayBuilderNode(RubyContext context) {
@@ -60,7 +63,7 @@ public void resume(Object[] store) {
         @Override
         public Object start() {
             CompilerDirectives.transferToInterpreter();
-            return new Object[RubyContext.ARRAYS_UNINITIALIZED_SIZE];
+            return new Object[ARRAYS_UNINITIALIZED_SIZE];
         }
 
         @Override

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
@@ -2930,8 +2930,6 @@ public Object selectObject(VirtualFrame frame, RubyArray array, RubyProc block)
                     // TODO(CS): cast to boolean?
                     notDesignedForCompilation();
 
-                    assert RubyContext.shouldObjectBeVisible(value);
-                    assert RubyContext.shouldObjectsBeVisible(new Object[]{value});
                     if (yieldBoolean(frame, block, new Object[]{value})) {
                         selectedStore = arrayBuilder.append(selectedStore, selectedSize, value);
                         selectedSize++;
@@ -3086,9 +3084,9 @@ public RubyArray sortVeryShortIntegerFixnum(VirtualFrame frame, RubyArray array)
 
             // Selection sort - written very carefully to allow PE
 
-            for (int i = 0; i < RubyContext.ARRAYS_SMALL; i++) {
+            for (int i = 0; i < RubyArray.ARRAYS_SMALL; i++) {
                 if (i < size) {
-                    for (int j = i + 1; j < RubyContext.ARRAYS_SMALL; j++) {
+                    for (int j = i + 1; j < RubyArray.ARRAYS_SMALL; j++) {
                         if (j < size) {
                             if ((int) compareDispatchNode.call(frame, store[j], "<=>", null, store[i]) < 0) {
                                 final int temp = store[j];
@@ -3122,9 +3120,9 @@ public RubyArray sortVeryShortLongFixnum(VirtualFrame frame, RubyArray array) {
 
             // Selection sort - written very carefully to allow PE
 
-            for (int i = 0; i < RubyContext.ARRAYS_SMALL; i++) {
+            for (int i = 0; i < RubyArray.ARRAYS_SMALL; i++) {
                 if (i < size) {
-                    for (int j = i + 1; j < RubyContext.ARRAYS_SMALL; j++) {
+                    for (int j = i + 1; j < RubyArray.ARRAYS_SMALL; j++) {
                         if (j < size) {
                             if ((int) compareDispatchNode.call(frame, store[j], "<=>", null, store[i]) < 0) {
                                 final long temp = store[j];
@@ -3205,7 +3203,7 @@ public int compare(Object a, Object b) {
         }
 
         protected static boolean isSmall(RubyArray array) {
-            return array.getSize() <= RubyContext.ARRAYS_SMALL;
+            return array.getSize() <= RubyArray.ARRAYS_SMALL;
         }
 
     }