[GR-9891] Upgrade MRAN mirror for the release.

PullRequest: fastr/1534

Author: steve-s

ci_common/common.hocon

@@ -1,8 +1,8 @@
 # java 7 is needed by Truffle (for now)
 java7 : {name : oraclejdk, version : "7",    platformspecific: true}
 # java 8 must be a jvmci enabled variant
-java8 : {name : labsjdk, version : "8u161-jvmci-0.41", platformspecific: true}
-java9 : {name : labsjdk, version : "9-ea+168", platformspecific: true}
+java8 : {name : labsjdk, version : "8u171-jvmci-0.43", platformspecific: true}
+java9 : {name : oraclejdk, version : "9.0.4+11", platformspecific: true}
 
 java8Downloads : {
   downloads : {
@@ -137,6 +137,9 @@ requireGCC: {
 }
 
 gateTestJava9Linux : ${java9Downloads} ${gateTestCommon} {
+  setup: [
+    [export, "FASTR_TEST_trace_tests=true"]
+  ]
   downloads : {
     JAVA_HOME : ${java9Downloads.downloads.JAVA_HOME}
     EXTRA_JAVA_HOMES : ${java9Downloads.downloads.EXTRA_JAVA_HOMES}

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/methods/MethodsListDispatch.java

@@ -22,6 +22,7 @@
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.instanceOf;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.lengthGt;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.lengthGte;
+import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.returnIf;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.singleElement;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.stringValue;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.toBoolean;
@@ -42,6 +43,7 @@
 import com.oracle.truffle.r.nodes.attributes.GetFixedAttributeNode;
 import com.oracle.truffle.r.nodes.builtin.NodeWithArgumentCasts.Casts;
 import com.oracle.truffle.r.nodes.builtin.RExternalBuiltinNode;
+import com.oracle.truffle.r.nodes.builtin.casts.fluent.PreinitialPhaseBuilder;
 import com.oracle.truffle.r.nodes.function.ClassHierarchyScalarNode;
 import com.oracle.truffle.r.nodes.function.ClassHierarchyScalarNodeGen;
 import com.oracle.truffle.r.nodes.function.PromiseHelperNode;
@@ -67,6 +69,7 @@
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.data.RPromise;
 import com.oracle.truffle.r.runtime.data.RS4Object;
+import com.oracle.truffle.r.runtime.data.RSymbol;
 import com.oracle.truffle.r.runtime.data.RTypedValue;
 import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
 import com.oracle.truffle.r.runtime.env.REnvironment;
@@ -82,18 +85,30 @@
 public class MethodsListDispatch {
 
     private static void checkSingleString(Casts casts, int argNum, String argName, String msg, boolean nonEmpty, Function<Object, String> clsHierFn,
-                    Function<Object, Integer> vecLenFn) {
+                    Function<Object, Integer> vecLenFn, boolean allowSymbol) {
+
+        PreinitialPhaseBuilder builder = casts.arg(argNum, argName).defaultError(Message.SINGLE_STRING_WRONG_TYPE, msg, clsHierFn);
+        if (allowSymbol) {
+            builder.returnIf(instanceOf(RSymbol.class));
+        }
+        checkSingleString(builder, msg, nonEmpty, vecLenFn);
+    }
+
+    private static void checkSingleString(PreinitialPhaseBuilder builder, String msg, boolean nonEmpty, Function<Object, Integer> vecLenFn) {
         //@formatter:off
-        casts.arg(argNum, argName).
-            defaultError(RError.Message.SINGLE_STRING_WRONG_TYPE, msg, clsHierFn).
-            mustBe(stringValue()).
-            asStringVector().
-            mustBe(singleElement(),  RError.Message.SINGLE_STRING_TOO_LONG, msg, vecLenFn).
-            findFirst().
-            mustBe(nonEmpty ? lengthGt(0) : lengthGte(0),  RError.Message.NON_EMPTY_STRING, msg);
+        builder.mustBe(stringValue()).
+                asStringVector().
+                mustBe(singleElement(), RError.Message.SINGLE_STRING_TOO_LONG, msg, vecLenFn).
+                findFirst().
+                mustBe(nonEmpty ? lengthGt(0) : lengthGte(0), RError.Message.NON_EMPTY_STRING, msg);
         //@formatter:on
     }
 
+    private static void checkSingleString(Casts casts, int argNum, String argName, String msg, boolean nonEmpty, Function<Object, String> clsHierFn,
+                    Function<Object, Integer> vecLenFn) {
+        checkSingleString(casts, argNum, argName, msg, nonEmpty, clsHierFn, vecLenFn, false);
+    }
+
     public abstract static class R_initMethodDispatch extends RExternalBuiltinNode.Arg1 {
 
         static {
@@ -353,7 +368,7 @@ public abstract static class R_getGeneric extends RExternalBuiltinNode.Arg4 {
             Function<Object, String> clsHierFn = ClassHierarchyScalarNode::get;
             Function<Object, Integer> vecLenFn = arg -> ((RAbstractStringVector) arg).getLength();
 
-            checkSingleString(casts, 0, "f", "The argument \"f\" to getGeneric", true, clsHierFn, vecLenFn);
+            checkSingleString(casts, 0, "f", "The argument \"f\" to getGeneric", true, clsHierFn, vecLenFn, true);
 
             casts.arg(1, "mustFind").asLogicalVector().findFirst(RRuntime.LOGICAL_FALSE).map(toBoolean());
 
@@ -362,6 +377,11 @@ public abstract static class R_getGeneric extends RExternalBuiltinNode.Arg4 {
             checkSingleString(casts, 3, "package", "The argument \"package\" to getGeneric", false, clsHierFn, vecLenFn);
         }
 
+        @Specialization
+        protected Object getGeneric(RSymbol name, boolean mustFind, REnvironment env, String pckg) {
+            return getGeneric(name.getName(), mustFind, env, pckg);
+        }
+
         @Specialization
         protected Object getGeneric(String name, boolean mustFind, REnvironment env, String pckg) {
             Object value = getGenericInternal.executeObject(name, env, pckg);
@@ -399,7 +419,7 @@ protected Object getGeneric(String name, REnvironment env, String pckg) {
                 }
                 FrameDescriptor currentFrameDesc = currentFrame.getFrameDescriptor();
                 Object o = slotRead(currentFrame, currentFrameDesc, name);
-                if (o != null) {
+                if (o instanceof RAttributable) {
                     RAttributable vl = (RAttributable) o;
                     boolean ok = false;
                     if (vl instanceof RFunction && getGenericAttrNode.execute(vl) != null) {
@@ -420,10 +440,6 @@ protected Object getGeneric(String name, REnvironment env, String pckg) {
                 }
                 rho = rho.getParent();
             }
-
-            // TODO: in GNU R there is additional code here that deals with the case of "name"
-            // being a symbol but at this point this case is not handled (even possible?) in
-            // FastR
             return generic == null ? RNull.instance : generic;
         }
 

com.oracle.truffle.r.native/Makefile

@@ -28,7 +28,7 @@ export FASTR_R_HOME=$(abspath $(TOPDIR)/..)
 export FASTR_LIB_DIR=$(FASTR_R_HOME)/lib
 export FASTR_NATIVE_DIR = $(TOPDIR)
 export R_VERSION = 3.4.0
-export DEFAULT_CRAN_MIRROR = "https://mran.microsoft.com/snapshot/2018-03-20"
+export DEFAULT_CRAN_MIRROR = "https://mran.microsoft.com/snapshot/2018-05-23"
 export GNUR_HOME = $(TOPDIR)/gnur/patch-build
 
 ifeq ($(FASTR_RFFI),llvm)

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java

@@ -181,6 +181,7 @@ public static class RunListener extends org.junit.runner.notification.RunListene
         private static File diffsOutputFile;
 
         private static final String PROP_BASE = "fastr.test.";
+        private static final String ENV_PROP_BASE = "FASTR_TEST_";
 
         private enum Props {
             GEN_EXPECTED("gen.expected"),
@@ -199,6 +200,9 @@ private enum Props {
         private static String getProperty(String baseName) {
             String propName = PROP_BASE + baseName;
             String val = System.getProperty(propName);
+            if (val == null || val.trim().isEmpty()) {
+                val = System.getenv(ENV_PROP_BASE + baseName.replace('.', '_'));
+            }
             return val;
         }