[GR-22265] RList - R vectors should use "storage strategy" pattern.

PullRequest: fastr/2410

Author: steve-s

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/ViewPort.java

@@ -164,10 +164,9 @@ public RList execute(VirtualFrame frame) {
 
             GridDevice device = GridContext.getContext().getCurrentDevice();
             // TODO: properly set the scale according to the current device
-            Object[] data = topVP.getDataWithoutCopying();
-            data[ViewPort.VP_XSCALE] = RDataFactory.createDoubleVector(new double[]{0, device.getNativeWidth()}, RDataFactory.COMPLETE_VECTOR);
-            data[ViewPort.VP_YSCALE] = RDataFactory.createDoubleVector(new double[]{device.getNativeHeight(), 0}, RDataFactory.COMPLETE_VECTOR);
-            data[ViewPort.PVP_GPAR] = GridContext.getContext().getGridState().getGpar();
+            topVP.setDataAt(ViewPort.VP_XSCALE, RDataFactory.createDoubleVector(new double[]{0, device.getNativeWidth()}, RDataFactory.COMPLETE_VECTOR));
+            topVP.setDataAt(ViewPort.VP_YSCALE, RDataFactory.createDoubleVector(new double[]{device.getNativeHeight(), 0}, RDataFactory.COMPLETE_VECTOR));
+            topVP.setDataAt(ViewPort.PVP_GPAR, GridContext.getContext().getGridState().getGpar());
             return DoSetViewPort.doSetViewPort(topVP, false, true);
         }
     }

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

@@ -241,7 +241,7 @@ private static Object combineRecursive(RArgsValuesAndNames args, Combine recursi
         for (int i = 0; i < argsArray.length; i++) {
             Object arg = argsArray[i];
             if (arg instanceof RList) {
-                Object[] argsFromList = ((RList) arg).getDataWithoutCopying();
+                Object[] argsFromList = ((RList) arg).getReadonlyData();
                 newArgsArray[i] = recursiveCombine.executeCombine(new RArgsValuesAndNames(argsFromList,
                                 ArgumentsSignature.empty(argsFromList.length)), true);
                 useNewArgs = true;

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedReplaceVectorNode.java

@@ -58,7 +58,6 @@
 import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.data.RMissing;
 import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RScalarList;
 import com.oracle.truffle.r.runtime.data.RScalarVector;
 import com.oracle.truffle.r.runtime.data.RSharingAttributeStorage;
 import com.oracle.truffle.r.runtime.data.RStringVector;
@@ -200,7 +199,7 @@ public Object apply(RAbstractVector originalVector, Object[] originalPositions,
         } else {
             if ((castType == RType.List || castType == RType.Expression) && mode.isSubscript() && !isDeleteElements() && !(castValue instanceof RScalarVector)) {
                 // wrap into a list when
-                value = RScalarList.valueOf(castValue);
+                value = RDataFactory.createListFromScalar(castValue);
             } else {
                 value = (RAbstractContainer) castValue;
             }

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/PrecedenceNode.java

@@ -43,7 +43,6 @@
 import com.oracle.truffle.r.runtime.data.RDoubleVector;
 import com.oracle.truffle.r.runtime.data.RExpression;
 import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RForeignListWrapper;
 import com.oracle.truffle.r.runtime.data.RFunction;
 import com.oracle.truffle.r.runtime.data.RInteropScalar;
 import com.oracle.truffle.r.runtime.data.RPairList;
@@ -180,12 +179,6 @@ protected int doListRecursive(RList val, boolean recursive,
         return doListRecursiveInternal(val, precedenceNode, recursive);
     }
 
-    @Specialization(guards = "recursive")
-    protected int doListRecursive(RForeignListWrapper val, boolean recursive,
-                    @Cached("createRecursive()") PrecedenceNode precedenceNode) {
-        return doListRecursiveInternal(val, precedenceNode, recursive);
-    }
-
     private static int doListRecursiveInternal(RAbstractListVector val, PrecedenceNode precedenceNode, boolean recursive) {
         int precedence = -1;
         for (int i = 0; i < val.getLength(); i++) {
@@ -215,12 +208,6 @@ protected int doList(RList val, boolean recursive) {
         return LIST_PRECEDENCE;
     }
 
-    @Specialization(guards = "!recursive")
-    @SuppressWarnings("unused")
-    protected int doList(RForeignListWrapper val, boolean recursive) {
-        return LIST_PRECEDENCE;
-    }
-
     @Specialization(guards = {"!recursive", "!val.isLanguage()"})
     @SuppressWarnings("unused")
     protected int doPairList(RPairList val, boolean recursive) {

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

@@ -432,10 +432,9 @@ static void signalError(RBaseNode callObj, Message msg, Object... args) {
     private static ReturnException gotoExitingHandler(Object cond, Object call, RList entry) throws ReturnException {
         REnvironment rho = (REnvironment) entry.getDataAt(ENTRY_TARGET_ENVIR);
         RList result = (RList) entry.getDataAt(ENTRY_RETURN_RESULT);
-        Object[] resultData = result.getDataWithoutCopying();
-        resultData[RESULT_COND] = cond;
-        resultData[RESULT_CALL] = call;
-        resultData[RESULT_HANDLER] = entry.getDataAt(ENTRY_HANDLER);
+        result.setDataAt(RESULT_COND, cond);
+        result.setDataAt(RESULT_CALL, call);
+        result.setDataAt(RESULT_HANDLER, entry.getDataAt(ENTRY_HANDLER));
         throw new ReturnException(result, RArguments.getCall(rho.getFrame()));
     }
 

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RComplex.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ public RAbstractVector castSafe(RType type, ConditionProfile isNAProfile, boolea
             case Character:
                 return RString.valueOf(RContext.getRRuntimeASTAccess().encodeComplex(this));
             case List:
-                return RScalarList.valueOf(this);
+                return RDataFactory.createListFromScalar(this);
             default:
                 return null;
         }

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java

@@ -1143,6 +1143,11 @@ public static RList createList() {
         return createList(new Object[0]);
     }
 
+    public static RList createListFromScalar(Object value) {
+        assert value != null;
+        return new RList(new Object[]{value});
+    }
+
     public static RList createList(int n) {
         return createList(createRNullArray(n));
     }

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDoubleForeignObjData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it