[GR-14327] [GR-14527] [GR-14784] Misc Truffle ecosystem related improvements.

PullRequest: fastr/1982

Author: steve-s

CHANGELOG.md

@@ -4,16 +4,21 @@
 * new Truffle interop converts `double` values to `int` values if they fit in the integer range
   * see the changes in the [spec tests](https://github.com/oracle/fastr/commit/e08e2b19571479dddb6167d9a1d492a14cb4c7b2#diff-c842fa11097793b19bd410589c36af99)
 
+Added missing R builtins and C APIa
+
+* simple support for the weak reference API functions (`R_MakeWeakRef`, `R_MakeWeakRefC`, `R_WeakRefKey`, `R_WeakRefValue`)
+* `Rf_i1mach`
+* `gzcon` builtin for `url` connections, e.g., `load(url('protocol://path'))` should work now
+* `Sys.localeconv` supports: `decimal_point`, `thousands_sep`, `grouping`, `int_curr_symbol`, `currency_symbol`, `mon_decimal_point`,
+  `mon_thousands_sep`, `mon_grouping`, `int_frac_digits`, `p_cs_precedes`, other fields are fixed to some meaningful but not culture
+  sensitive value for given field
+
 Bug fixes:
 
 * `rep.int` with value argument of length 0 just returns the value argument
 * `tcrossprod` called from `apply` did not give correct result #60
 * `Rf_lengthgets` can accept `NULL` argument
-
-Added missing R builtins and C APIa
-
-* simple support for the weak reference API functions (`R_MakeWeakRef`, `R_MakeWeakRefC`, `R_WeakRefKey`, `R_WeakRefValue`)
-* `Rf_i1mach`
+* FastR does not allow Java interop when not started with `--jvm`
 
 # 1.0 RC 14
 

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java

@@ -61,6 +61,7 @@
 import com.oracle.truffle.r.runtime.context.RContext;
 import com.oracle.truffle.r.runtime.context.TruffleRLanguage;
 import com.oracle.truffle.r.runtime.data.RFunction;
+import com.oracle.truffle.r.runtime.data.RInteropScalar.RInteropNA;
 import com.oracle.truffle.r.runtime.data.RPromise;
 import com.oracle.truffle.r.runtime.data.RTypedValue;
 import com.oracle.truffle.r.runtime.env.REnvironment;
@@ -140,6 +141,21 @@ protected void disposeContext(RContext context) {
 
     @Override
     protected String toString(RContext context, Object value) {
+        // primitive values are never produced by FastR so we don't print them as R vectors
+        if (value instanceof Boolean) {
+            // boolean constants are capitalized like in R
+            return (boolean) value ? "TRUE" : "FALSE";
+        }
+        if (value instanceof Number || value instanceof String || value instanceof Character) {
+            return value.toString();
+        }
+
+        // special class designated to exchange NA values with the outside world
+        // this value is a scalar, the only way to get it is via getArrayMember on an R vector
+        if (value instanceof RInteropNA) {
+            return "NA";
+        }
+
         // the debugger also passes result of TruffleRLanguage.findMetaObject() to this method
         Object unwrapped = value;
         // print promises by other means than the "print" function to avoid evaluating them
@@ -155,8 +171,11 @@ protected String toString(RContext context, Object value) {
         if (RMissingHelper.isMissing(unwrapped)) {
             return "missing";
         }
-        Object asVector = RRuntime.asAbstractVector(unwrapped);
-        if (!(asVector instanceof TruffleObject)) {
+
+        // the value unwrapped from an RPromise can be primitive Java type, but now we know that we
+        // are dealing with primitive that is supposed to be treated as R vector
+        unwrapped = RRuntime.asAbstractVector(unwrapped);
+        if (!(unwrapped instanceof TruffleObject)) {
             throw RError.error(RError.NO_CALLER, Message.GENERIC, String.format("Printing value of type '%s' is not supported by the R language.", unwrapped.getClass().getSimpleName()));
         }
         Object printObj = REnvironment.baseEnv(context).get("print");
@@ -171,7 +190,7 @@ protected String toString(RContext context, Object value) {
         try {
             StringBuilder buffer = new StringBuilder();
             stateStdConnections.setBuffer(buffer);
-            RContext.getEngine().evalFunction((RFunction) printObj, callingFrame, RCaller.topLevel, false, ArgumentsSignature.empty(1), asVector);
+            RContext.getEngine().evalFunction((RFunction) printObj, callingFrame, RCaller.topLevel, false, ArgumentsSignature.empty(1), unwrapped);
             // remove the last "\n", which is useful for REPL, but not here
             if (buffer.length() > 0 && buffer.charAt(buffer.length() - 1) == '\n') {
                 buffer.setLength(buffer.length() - 1);

com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java

@@ -180,8 +180,8 @@ protected void launch(Builder contextBuilderIn) {
         }
         this.consoleHandler = ConsoleHandler.createConsoleHandler(options, null, inStream, outStream);
         Builder contextBuilder = contextBuilderIn;
-        if (!ignoreJvmArguments) {
-            contextBuilder = contextBuilder.allowHostAccess(useJVM);
+        if (!ignoreJvmArguments && !useJVM) {
+            contextBuilder.allowHostClassLookup(null);
         }
 
         Context context;

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

@@ -258,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 {
 
@@ -273,7 +279,9 @@ protected Object exportSymbol(String name, TruffleObject value) {
             if (name == null) {
                 throw error(RError.Message.INVALID_ARGUMENT, "name");
             }
-            RContext.getInstance().getEnv().exportSymbol(name, value);
+            Env env = RContext.getInstance().getEnv();
+            checkPolyglotAccess(env);
+            env.exportSymbol(name, value);
             return RNull.instance;
         }
 
@@ -301,7 +309,9 @@ public abstract static class Import extends RBuiltinNode.Arg1 {
         @Specialization
         @TruffleBoundary
         protected Object importSymbol(String name) {
-            Object object = RContext.getInstance().getEnv().importSymbol(name);
+            Env env = RContext.getInstance().getEnv();
+            checkPolyglotAccess(env);
+            Object object = env.importSymbol(name);
             if (object == null) {
                 throw error(RError.Message.NO_IMPORT_OBJECT, name);
             }

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.runtime/src/com/oracle/truffle/r/runtime/context/PackagePatching.java

@@ -64,6 +64,10 @@ public class PackagePatching {
                     new Patch("reinterpret_cast<.*>\\((.*)\\)->gp &= (\\w+|\\(.*\\))", "SETLEVELS($1, LEVELS($1) & ($2))"),
                     new Patch("reinterpret_cast<.*>\\((.*)\\)->gp \\|= (\\w+|\\(.*\\))", "SETLEVELS($1, LEVELS($1) | ($2))"),
                     new Patch("reinterpret_cast<.*>\\((.*)\\)->gp \\^= (\\w+|\\(.*\\))", "SETLEVELS($1, LEVELS($1) ^ ($2))"),
+                    // FastR does not support these global variables:
+                    new Patch("R_Interactive\\s*=\\s*[01]", ""),
+                    new Patch("R_isForkedChild\\s*=\\s*[01]", ""),
+                    new Patch("Rf_KillAllDevices\\s*\\(\\s*\\)", ""),
     };
 
     @TruffleBoundary

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

@@ -29323,6 +29323,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>
@@ -54102,47 +54106,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
@@ -150339,24 +150343,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') }
@@ -150378,9 +150382,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') }