Remove polyglot access check for parsing

Author: steve-s

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java

@@ -118,12 +118,6 @@ public static void testingMode() {
         isTesting = true;
     }
 
-    private static void checkPolyglotAccess(Env env) {
-        if (!env.isPolyglotAccessAllowed()) {
-            throw RError.error(RError.SHOW_CALLER, RError.Message.GENERIC, "Polyglot bindings are not accessible for this language. Use --polyglot or allowPolyglotAccess when building the context.");
-        }
-    }
-
     @RBuiltin(name = "eval.polyglot", visibility = CUSTOM, kind = PRIMITIVE, parameterNames = {"languageId", "code", "path"}, behavior = COMPLEX)
     public abstract static class Eval extends RBuiltinNode.Arg3 {
 
@@ -176,7 +170,6 @@ protected Object eval(@SuppressWarnings("unused") RMissing languageId, @Suppress
         protected CallTarget parse(String languageId, String code) {
             CompilerAsserts.neverPartOfCompilation();
             Env env = RContext.getInstance().getEnv();
-            checkPolyglotAccess(env);
             LanguageInfo languageInfo = languageId != null ? env.getLanguages().get(languageId) : null;
             if ((languageId != null && languageInfo == null) || (languageInfo != null && languageInfo.isInternal())) {
                 throw error(RError.Message.LANGUAGE_NOT_AVAILABLE, languageId);
@@ -230,7 +223,6 @@ private Object parseFileAndCall(String path, String languageId) {
         protected CallTarget parseFile(String path, String languageIdArg) {
             CompilerAsserts.neverPartOfCompilation();
             Env env = RContext.getInstance().getEnv();
-            checkPolyglotAccess(env);
             TruffleFile tFile = env.getTruffleFile(Utils.tildeExpand(path, false)).getAbsoluteFile();
             LanguageInfo languageInfo = null;
             try {
@@ -266,6 +258,12 @@ protected Object eval(@SuppressWarnings("unused") RMissing code, @SuppressWarnin
         }
     }
 
+    private static void checkPolyglotAccess(Env env) {
+        if (!env.isPolyglotAccessAllowed()) {
+            throw RError.error(RError.SHOW_CALLER, RError.Message.POLYGLOT_BINDING_NOT_AVAILABLE);
+        }
+    }
+
     @RBuiltin(name = "export", visibility = OFF, kind = PRIMITIVE, parameterNames = {"name", "value"}, behavior = COMPLEX)
     public abstract static class Export extends RBuiltinNode.Arg2 {
 

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RError.java

@@ -1032,7 +1032,8 @@ public enum Message {
                         "SET_ATTRIB: tag in the attributes pairlist must be a symbol. %s given. It is possible that the code intends to set the TAG after the call to SET_ATTRIB, but this is not supported in FastR."),
         WRONG_ARGS_COMBINATION("Wrong arguments combination, please refer to ?%s for more details."),
         COULD_NOT_FIND_LANGUAGE("Could not find language corresponding to extension '%s', you can specify the language id explicitly, please refer to ?%s for more details."),
-        LANGUAGE_NOT_AVAILABLE("Language with id '%s' is not available. Did you start R with --polyglot?"),
+        LANGUAGE_NOT_AVAILABLE("Language with id '%s' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?"),
+        POLYGLOT_BINDING_NOT_AVAILABLE("Polyglot bindings are not accessible for this language. Use --polyglot or allowPolyglotAccess when building the context."),
         NO_LANGUAGE_PROVIDED("No language id provided, please refer to ?%s for more details."),
         NO_CODE_OR_PATH_PROVIDED("No code or path provided, please refer to ?%s for more details."),
         LENGTH_OF_NULL_UNCHANGED("length of NULL cannot be changed"),

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -29314,6 +29314,10 @@ NULL
 #environment(print)
 <environment: namespace:base>
 
+##com.oracle.truffle.r.test.builtins.TestBuiltin_environment.testEnvironment#
+#{ env <- list2env(list(customenvvar = 42)); fst <- function(fstvar) do.call(environment, list(), envir = env); a <- fst(0); ls(a) }
+[1] "customenvvar"
+
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_environment.testEnvironment#
 #{ f <- y~z; class(f) <- c('myclass', class(f)); environment(f) }
 <environment: R_GlobalEnv>
@@ -54093,47 +54097,47 @@ expression(for (i in 1:10) {
     x[i] <- i
 })
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#Output.IgnoreWarningMessage#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#
 #{ source("test/r/simple/data/tree2/setx.r") ; x }
 Error in file(filename, "r", encoding = encoding) :
   cannot open the connection
 In addition: Warning message:
 In file(filename, "r", encoding = encoding) :
   cannot open file 'test/r/simple/data/tree2/setx.r': No such file or directory
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#Output.IgnoreWarningMessage#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#
 #{ source("test/r/simple/data/tree2/setx.r", local=TRUE) ; x }
 Error in file(filename, "r", encoding = encoding) :
   cannot open the connection
 In addition: Warning message:
 In file(filename, "r", encoding = encoding) :
   cannot open file 'test/r/simple/data/tree2/setx.r': No such file or directory
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#Output.IgnoreWarningMessage#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#
 #{ x <- 1; f <- function() { source("test/r/simple/data/tree2/incx.r", local=FALSE) ; x } ; c(f(), x) }
 Error in file(filename, "r", encoding = encoding) :
   cannot open the connection
 In addition: Warning message:
 In file(filename, "r", encoding = encoding) :
   cannot open file 'test/r/simple/data/tree2/incx.r': No such file or directory
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#Output.IgnoreWarningMessage#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#
 #{ x <- 1; f <- function() { source("test/r/simple/data/tree2/incx.r", local=TRUE) ; x } ; c(f(), x) }
 Error in file(filename, "r", encoding = encoding) :
   cannot open the connection
 In addition: Warning message:
 In file(filename, "r", encoding = encoding) :
   cannot open file 'test/r/simple/data/tree2/incx.r': No such file or directory
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#Output.IgnoreWarningMessage#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#
 #{ x <- 1; f <- function() { source("test/r/simple/data/tree2/setx.r", local=FALSE) ; x } ; c(f(), x) }
 Error in file(filename, "r", encoding = encoding) :
   cannot open the connection
 In addition: Warning message:
 In file(filename, "r", encoding = encoding) :
   cannot open file 'test/r/simple/data/tree2/setx.r': No such file or directory
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#Output.IgnoreWarningMessage#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_parse.testSource#
 #{ x <- 1; f <- function() { source("test/r/simple/data/tree2/setx.r", local=TRUE) ; x } ; c(f(), x) }
 Error in file(filename, "r", encoding = encoding) :
   cannot open the connection
@@ -150330,24 +150334,24 @@ Error: unexpected ';' in "if (!any(R.version$engine == "FastR")) { TRUE } else {
 [1] "123"
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEval#
-#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("foo", "bar") :\n  Language with id \'foo\' is not available. Did you start R with --polyglot?\n') } else { eval.polyglot('foo', 'bar') }
+#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("foo", "bar") :\n  Language with id \'foo\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\n') } else { eval.polyglot('foo', 'bar') }
 Error in eval.polyglot("foo", "bar") :
-  Language with id 'foo' is not available. Did you start R with --polyglot?
+  Language with id 'foo' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEval#
-#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("foo", , "bar") :\n  Language with id \'foo\' is not available. Did you start R with --polyglot?\n') } else { eval.polyglot('foo',, 'bar') }
+#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("foo", , "bar") :\n  Language with id \'foo\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\n') } else { eval.polyglot('foo',, 'bar') }
 Error in eval.polyglot("foo", , "bar") :
-  Language with id 'foo' is not available. Did you start R with --polyglot?
+  Language with id 'foo' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEval#
-#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("nfi", "foo.bar") :\n  Language with id \'nfi\' is not available. Did you start R with --polyglot?\n') } else { eval.polyglot('nfi', 'foo.bar') }
+#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("nfi", "foo.bar") :\n  Language with id \'nfi\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\n') } else { eval.polyglot('nfi', 'foo.bar') }
 Error in eval.polyglot("nfi", "foo.bar") :
-  Language with id 'nfi' is not available. Did you start R with --polyglot?
+  Language with id 'nfi' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEval#
-#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("nfi", , "foo.bar") :\n  Language with id \'nfi\' is not available. Did you start R with --polyglot?\n') } else { eval.polyglot('nfi',,'foo.bar') }
+#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("nfi", , "foo.bar") :\n  Language with id \'nfi\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\n') } else { eval.polyglot('nfi',,'foo.bar') }
 Error in eval.polyglot("nfi", , "foo.bar") :
-  Language with id 'nfi' is not available. Did you start R with --polyglot?
+  Language with id 'nfi' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEval#
 #if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot(, "bar") :\n  No language id provided, please refer to ?eval.polyglot for more details.\n') } else { eval.polyglot(, 'bar') }
@@ -150369,9 +150373,9 @@ Error in eval.polyglot("js", "console.log(42)", "file.js") :
   Wrong arguments combination, please refer to ?eval.polyglot for more details.
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEvalFile#
-#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("nonExistentLanguage", "code") :<<<NEWLINE>>>  Language with id \'nonExistentLanguage\' is not available. Did you start R with --polyglot?\n') } else { eval.polyglot('nonExistentLanguage', 'code') }
+#if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("nonExistentLanguage", "code") :<<<NEWLINE>>>  Language with id \'nonExistentLanguage\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\n') } else { eval.polyglot('nonExistentLanguage', 'code') }
 Error in eval.polyglot("nonExistentLanguage", "code") :
-  Language with id 'nonExistentLanguage' is not available. Did you start R with --polyglot?
+  Language with id 'nonExistentLanguage' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?
 
 ##com.oracle.truffle.r.test.library.fastr.TestInterop.testInteropEvalFile#
 #if (!any(R.version$engine == "FastR")) { cat('Error in eval.polyglot("someLanguage") :<<<NEWLINE>>>  No code or path provided, please refer to ?eval.polyglot for more details.\n') } else { eval.polyglot('someLanguage') }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestInterop.java

@@ -26,7 +26,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.junit.Assert;
@@ -91,13 +90,13 @@ public void cleanup() {
 
     @Test
     public void testPolyglotAccessWhenPolyglotBindingsAreDisabled() {
-        String message = "no PolyglotException exception occurred";
         try (org.graalvm.polyglot.Context context = FastRSession.getContextBuilder("R").allowPolyglotAccess(PolyglotAccess.NONE).build()) {
             context.eval("R", "eval.polyglot('js', '1+3')");
+            Assert.fail("no PolyglotException exception occurred");
         } catch (PolyglotException ex) {
-            message = ex.getMessage();
+            String message = ex.getMessage();
+            assertTrue(message, message.contains("Language with id 'js' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?"));
         }
-        assertTrue(message, message.contains("Polyglot bindings are not accessible for this language. Use --polyglot or allowPolyglotAccess when building the context."));
     }
 
     @Test
@@ -115,14 +114,14 @@ public void testInteropEval() {
                         "cat('Error in eval.polyglot(, , \"bar\") :\\n  Could not find language corresponding to extension \\'bar\\', you can specify the language id explicitly, please refer to ?eval.polyglot for more details.\\n')");
         // Checkstyle: resume
         assertEvalFastR("eval.polyglot('foo', 'bar')",
-                        "cat('Error in eval.polyglot(\"foo\", \"bar\") :\\n  Language with id \\'foo\\' is not available. Did you start R with --polyglot?\\n')");
+                        "cat('Error in eval.polyglot(\"foo\", \"bar\") :\\n  Language with id \\'foo\\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\\n')");
         assertEvalFastR("eval.polyglot('nfi', 'foo.bar')",
-                        "cat('Error in eval.polyglot(\"nfi\", \"foo.bar\") :\\n  Language with id \\'nfi\\' is not available. Did you start R with --polyglot?\\n')");
+                        "cat('Error in eval.polyglot(\"nfi\", \"foo.bar\") :\\n  Language with id \\'nfi\\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\\n')");
         // Checkstyle: stop
         assertEvalFastR("eval.polyglot('foo',, 'bar')",
-                        "cat('Error in eval.polyglot(\"foo\", , \"bar\") :\\n  Language with id \\'foo\\' is not available. Did you start R with --polyglot?\\n')");
+                        "cat('Error in eval.polyglot(\"foo\", , \"bar\") :\\n  Language with id \\'foo\\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\\n')");
         assertEvalFastR("eval.polyglot('nfi',,'foo.bar')",
-                        "cat('Error in eval.polyglot(\"nfi\", , \"foo.bar\") :\\n  Language with id \\'nfi\\' is not available. Did you start R with --polyglot?\\n')");
+                        "cat('Error in eval.polyglot(\"nfi\", , \"foo.bar\") :\\n  Language with id \\'nfi\\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\\n')");
         // Checkstyle: resume
     }
 
@@ -160,7 +159,7 @@ public void testInteropEvalFile() {
         assertEvalFastR("f<-paste0(tempfile(),'.nonLanguageExtension'); file.create(f); tryCatch(eval.polyglot(path=f), finally=file.remove(f))",
                         "cat('Error in eval.polyglot(path = f) :\n  Could not find language corresponding to extension \\'nonLanguageExtension\\', you can specify the language id explicitly, please refer to ?eval.polyglot for more details.\\n')");
         assertEvalFastR("eval.polyglot('nonExistentLanguage', 'code')",
-                        "cat('Error in eval.polyglot(\"nonExistentLanguage\", \"code\") :\n  Language with id \\'nonExistentLanguage\\' is not available. Did you start R with --polyglot?\\n')");
+                        "cat('Error in eval.polyglot(\"nonExistentLanguage\", \"code\") :\n  Language with id \\'nonExistentLanguage\\' is not available. Did you start R with --polyglot or use allowPolyglotAccess when building the context?\\n')");
         assertEvalFastR("eval.polyglot(code='')", "cat('Error in eval.polyglot(code = \"\") :\n  No language id provided, please refer to ?eval.polyglot for more details.\\n')");
         assertEvalFastR("eval.polyglot(languageId='js')", "cat('Error in eval.polyglot(languageId = \"js\") :\n  No code or path provided, please refer to ?eval.polyglot for more details.\\n')");
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java

@@ -34,7 +34,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
 import org.junit.Assert;
 import org.junit.Before;