Move options reading from PE'd code

Author: steve-s

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/PromiseHelperNode.java

@@ -22,6 +22,8 @@
  */
 package com.oracle.truffle.r.nodes.function;
 
+import static com.oracle.truffle.r.runtime.context.FastROptions.PromiseCacheSize;
+
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -45,7 +47,6 @@
 import com.oracle.truffle.r.nodes.function.visibility.GetVisibilityNode;
 import com.oracle.truffle.r.nodes.function.visibility.SetVisibilityNode;
 import com.oracle.truffle.r.runtime.DSLConfig;
-import static com.oracle.truffle.r.runtime.context.FastROptions.PromiseCacheSize;
 import com.oracle.truffle.r.runtime.RArguments;
 import com.oracle.truffle.r.runtime.RCaller;
 import com.oracle.truffle.r.runtime.RError;
@@ -407,12 +408,18 @@ protected abstract static class GenerateValueNonDefaultOptimizedNode extends Nod
         protected static final int CACHE_SIZE = ArgumentStatePush.MAX_COUNTED_ARGS * 2;
         protected static final int RECURSIVE_PROMISE_LIMIT = 3;
 
+        // If set to -1, then no further recursion should take place
+        // This avoids having to invoke DSLConfig.getCacheSize in PE'd code
         private final byte recursiveCounter;
         @Child private PromiseHelperNode nextNode = null;
         @Child private SetVisibilityNode visibility;
 
         protected GenerateValueNonDefaultOptimizedNode(byte recursiveCounter) {
-            this.recursiveCounter = recursiveCounter;
+            if (recursiveCounter > DSLConfig.getCacheSize(RECURSIVE_PROMISE_LIMIT)) {
+                this.recursiveCounter = -1;
+            } else {
+                this.recursiveCounter = recursiveCounter;
+            }
         }
 
         public abstract Object execute(VirtualFrame frame, int state, EagerPromise promise);
@@ -476,7 +483,7 @@ Object doFallback(@SuppressWarnings("unused") int state, @SuppressWarnings("unus
         // If promise evaluates to another promise, we create another RPromiseHelperNode to evaluate
         // that, but only up to certain recursion level
         private Object evaluateNextNode(VirtualFrame frame, RPromise nextPromise) {
-            if (recursiveCounter > DSLConfig.getCacheSize(RECURSIVE_PROMISE_LIMIT)) {
+            if (recursiveCounter == -1) {
                 evaluateNextNodeSlowPath(frame.materialize(), nextPromise);
             }
             if (nextNode == null) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/RContext.java

@@ -22,6 +22,12 @@
  */
 package com.oracle.truffle.r.runtime.context;
 
+import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEval;
+import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalConstants;
+import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalDefault;
+import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalExpressions;
+import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalVariables;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -46,7 +52,10 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.graalvm.options.OptionKey;
+
 import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
@@ -67,11 +76,6 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.r.launcher.RCmdOptions;
 import com.oracle.truffle.r.launcher.RStartParams;
-import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEval;
-import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalConstants;
-import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalDefault;
-import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalExpressions;
-import static com.oracle.truffle.r.runtime.context.FastROptions.EagerEvalVariables;
 import com.oracle.truffle.r.runtime.LazyDBCache;
 import com.oracle.truffle.r.runtime.PrimitiveMethodsInfo;
 import com.oracle.truffle.r.runtime.REnvVars;
@@ -106,7 +110,6 @@
 import com.oracle.truffle.r.runtime.nodes.RCodeBuilder;
 import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
 import com.oracle.truffle.r.runtime.rng.RRNG;
-import org.graalvm.options.OptionKey;
 
 /**
  * Encapsulates the runtime state ("context") of an R session. All access to that state from the
@@ -646,21 +649,17 @@ public int getNonNegativeIntOption(OptionKey<Integer> key) {
         if (res >= 0) {
             return res;
         }
-        System.out.println("non negative integer option value expected");
-        new RuntimeException().printStackTrace();
-        System.exit(2);
-        return -1;
+        CompilerDirectives.transferToInterpreter();
+        throw RInternalError.shouldNotReachHere(String.format("R option '%s' has invalid value"));
     }
 
     public double getNonNegativeDoubleOption(OptionKey<Double> key) {
         double res = getOption(key);
         if (res >= 0) {
             return res;
         }
-        System.out.println("non negative double option value expected");
-        new RuntimeException().printStackTrace();
-        System.exit(2);
-        return -1;
+        CompilerDirectives.transferToInterpreter();
+        throw RInternalError.shouldNotReachHere(String.format("R option '%s' has invalid value"));
     }
 
     public boolean noEagerEvalOption() {