Merge commit '24e71c61bfd8ac30671b05654943ffaab48787a4' into release/graal-vm/1.0

Author: ansalond

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java

@@ -582,13 +582,6 @@ public int LEVELS(Object x) {
         if (x instanceof RTypedValue) {
             int gpBits = ((RTypedValue) x).getGPBits();
             return gpBits;
-        } else if (x instanceof CharSXPWrapper) {
-            // TODO returning ASCII_MASK works for data.table,
-            // but properly CharSXPWrapper has to implement RTypedValue ...
-            // see also CHARSXP charset bits in include/Defn.h
-            // #define ASCII_MASK (1<<6)
-            // return 1 << 6;
-            throw RInternalError.shouldNotReachHere("Not yet implemented - CharSXPWrapper has to implement RTypedValue!");
         }
         throw RInternalError.shouldNotReachHere();
     }

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/PPSum.java

@@ -23,11 +23,13 @@
 package com.oracle.truffle.r.library.stats;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.r.library.stats.PPSumFactory.IntgrtVecNodeGen;
 import com.oracle.truffle.r.library.stats.PPSumFactory.PPSumExternalNodeGen;
 import com.oracle.truffle.r.nodes.builtin.RExternalBuiltinNode;
+import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.data.RDataFactory.VectorFactory;
 import com.oracle.truffle.r.runtime.data.RDoubleVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
@@ -36,14 +38,15 @@
 
 public abstract class PPSum {
 
+    @ImportStatic(DSLConfig.class)
     public abstract static class PPSumExternal extends RExternalBuiltinNode.Arg2 {
         static {
             Casts casts = new Casts(PPSumExternal.class);
             casts.arg(0).asDoubleVector();
             casts.arg(1).asIntegerVector().findFirst();
         }
 
-        @Specialization(guards = "uAccess.supports(u)")
+        @Specialization(guards = "uAccess.supports(u)", limit = "getVectorAccessCacheSize()")
         protected RDoubleVector doPPSum(RAbstractDoubleVector u, int sl,
                         @Cached("create()") VectorFactory factory,
                         @Cached("u.access()") VectorAccess uAccess) {

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/RMultinomNode.java

@@ -29,13 +29,15 @@
 import static com.oracle.truffle.r.runtime.RError.Message.NO_POSITIVE_PROBABILITIES;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.r.nodes.attributes.GetFixedAttributeNode;
 import com.oracle.truffle.r.nodes.attributes.SetFixedAttributeNode;
 import com.oracle.truffle.r.nodes.builtin.RExternalBuiltinNode;
 import com.oracle.truffle.r.nodes.function.opt.UpdateShareableChildValueNode;
+import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RError.Message;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
@@ -52,6 +54,7 @@
 /**
  * Implements the vectorization of {@link RMultinomNode}.
  */
+@ImportStatic(DSLConfig.class)
 public abstract class RMultinomNode extends RExternalBuiltinNode.Arg3 {
 
     private final Rbinom rbinom = new Rbinom();
@@ -78,7 +81,7 @@ public RBaseNode getErrorContext() {
         return RError.SHOW_CALLER;
     }
 
-    @Specialization(guards = "probsAccess.supports(probs)")
+    @Specialization(guards = "probsAccess.supports(probs)", limit = "getVectorAccessCacheSize()")
     protected RIntVector doMultinom(int n, int size, RAbstractDoubleVector probs,
                     @Cached("probs.access()") VectorAccess probsAccess) {
         try (SequentialIterator probsIter = probsAccess.access(probs)) {

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java

@@ -29,10 +29,12 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
 import com.oracle.truffle.r.nodes.control.RLengthNode;
+import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.builtins.RBuiltin;
 import com.oracle.truffle.r.runtime.data.RComplex;
@@ -44,6 +46,7 @@
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess.SequentialIterator;
 
+@ImportStatic(DSLConfig.class)
 @RBuiltin(name = "anyNA", kind = PRIMITIVE, parameterNames = {"x", "recursive"}, dispatch = INTERNAL_GENERIC, behavior = PURE_SUMMARY)
 public abstract class AnyNA extends RBuiltinNode.Arg2 {
 
@@ -106,7 +109,7 @@ protected byte isNA(@SuppressWarnings("unused") RNull value, @SuppressWarnings("
         return RRuntime.LOGICAL_FALSE;
     }
 
-    @Specialization(guards = "xAccess.supports(x)")
+    @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")
     protected byte anyNACached(RAbstractAtomicVector x, @SuppressWarnings("unused") boolean recursive,
                     @Cached("x.access()") VectorAccess xAccess) {
         switch (xAccess.getType()) {

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java

@@ -414,6 +414,7 @@ public BasePackage() {
         add(DynLoadFunctions.GetSymbolInfo.class, DynLoadFunctionsFactory.GetSymbolInfoNodeGen::create);
         add(DynLoadFunctions.IsLoaded.class, DynLoadFunctionsFactory.IsLoadedNodeGen::create);
         add(VersionFunctions.ExtSoftVersion.class, VersionFunctionsFactory.ExtSoftVersionNodeGen::create);
+        add(EApply.class, EApplyNodeGen::create);
         add(EncodeString.class, EncodeStringNodeGen::create);
         add(EncodingFunctions.Encoding.class, EncodingFunctionsFactory.EncodingNodeGen::create);
         add(EncodingFunctions.SetEncoding.class, EncodingFunctionsFactory.SetEncodingNodeGen::create);

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CharTr.java

@@ -54,7 +54,7 @@ public static CharTr create() {
         return CharTrNodeGen.create();
     }
 
-    @Specialization(guards = "vectorReuse.supports(values)")
+    @Specialization(guards = "vectorReuse.supports(values)", limit = "getVectorAccessCacheSize()")
     RAbstractStringVector doIt(String oldStr, String newStr, RAbstractStringVector values,
                     @Cached("createTemporary(values)") VectorReuse vectorReuse,
                     @Cached("create()") RemoveRegAttributesNode removeRegAttributesNode) {

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Colon.java

@@ -161,7 +161,7 @@ protected RSequence colonAscending(int left, double right,
             if (isDouble.profile(right > Integer.MAX_VALUE)) {
                 return RDataFactory.createAscendingRange(left, right);
             } else {
-                return RDataFactory.createAscendingRange(left, (int) right);
+                return RDataFactory.createIntSequence(left, 1, RDataFactory.effectiveLength(left, right));
             }
         }
 
@@ -174,7 +174,7 @@ protected RSequence colonDescending(int left, double right,
             if (isDouble.profile(right <= Integer.MIN_VALUE)) {
                 return RDataFactory.createDescendingRange(left, right);
             } else {
-                return RDataFactory.createDescendingRange(left, (int) right);
+                return RDataFactory.createIntSequence(left, -1, RDataFactory.effectiveLength(left, right));
             }
         }
 

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java

@@ -68,6 +68,7 @@
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.builtins.RBuiltin;
+import com.oracle.truffle.r.runtime.data.CharSXPWrapper;
 import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
 import com.oracle.truffle.r.runtime.data.RAttributesLayout;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
@@ -127,6 +128,7 @@ protected boolean isSimpleArguments(RArgsValuesAndNames args) {
                         !(args.getArgument(0) instanceof RPairList) &&
                         !(args.getArgument(0) instanceof RSymbol) &&
                         !(args.getArgument(0) instanceof RS4Object) &&
+                        !(args.getArgument(0) instanceof CharSXPWrapper) &&
                         !RRuntime.isForeignObject(args.getArgument(0));
     }
 

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ConnectionFunctions.java

@@ -65,13 +65,15 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.r.nodes.builtin.NodeWithArgumentCasts.Casts;
 import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
 import com.oracle.truffle.r.nodes.builtin.base.ConnectionFunctionsFactory.WriteDataNodeGen;
 import com.oracle.truffle.r.nodes.builtin.casts.fluent.HeadPhaseBuilder;
+import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.RCompression;
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RError.Message;
@@ -1048,6 +1050,7 @@ private static RLogicalVector readLogical(RConnection con, int n, boolean swap)
         }
     }
 
+    @ImportStatic(DSLConfig.class)
     @TypeSystemReference(RTypes.class)
     public abstract static class WriteDataNode extends RBaseNode {
 
@@ -1069,7 +1072,7 @@ private static byte[] encodeString(String s) {
             return s.getBytes(StandardCharsets.UTF_8);
         }
 
-        @Specialization(guards = "objectAccess.supports(object)")
+        @Specialization(guards = "objectAccess.supports(object)", limit = "getVectorAccessCacheSize()")
         protected ByteBuffer write(RAbstractVector object, @SuppressWarnings("unused") int size, boolean swap, @SuppressWarnings("unused") boolean useBytes,
                         @Cached("object.access()") VectorAccess objectAccess) {
             try (SequentialIterator iter = objectAccess.access(object)) {

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CumProd.java

@@ -68,7 +68,7 @@ protected RDoubleVector cumNull(@SuppressWarnings("unused") RNull x) {
         return RDataFactory.createEmptyDoubleVector();
     }
 
-    @Specialization(guards = "xAccess.supports(x)")
+    @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")
     protected RDoubleVector cumprodDouble(RAbstractDoubleVector x,
                     @Cached("x.access()") VectorAccess xAccess) {
         try (SequentialIterator iter = xAccess.access(x)) {
@@ -97,7 +97,7 @@ protected RDoubleVector cumprodDoubleGeneric(RAbstractDoubleVector x) {
         return cumprodDouble(x, x.slowPathAccess());
     }
 
-    @Specialization(guards = "xAccess.supports(x)")
+    @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")
     protected RComplexVector cumprodComplex(RAbstractComplexVector x,
                     @Cached("x.access()") VectorAccess xAccess) {
         try (SequentialIterator iter = xAccess.access(x)) {