Remove RStringVector.getWrappedDataAt and setWrappedDataAt methods

(cherry picked from commit 2d176b2)

Author: Pavel Marek

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AsCharNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, 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
@@ -26,17 +26,19 @@
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.r.nodes.unary.CastStringNode;
 import com.oracle.truffle.r.runtime.RInternalError;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.data.CharSXPWrapper;
+import com.oracle.truffle.r.runtime.data.RComplexVector;
 import com.oracle.truffle.r.runtime.data.RDoubleVector;
+import com.oracle.truffle.r.runtime.data.RStringVector;
 import com.oracle.truffle.r.runtime.data.RSymbol;
 import com.oracle.truffle.r.runtime.data.RTypes;
+import com.oracle.truffle.r.runtime.data.VectorDataLibrary;
 import com.oracle.truffle.r.runtime.data.model.RAbstractAtomicVector;
-import com.oracle.truffle.r.runtime.data.RComplexVector;
-import com.oracle.truffle.r.runtime.data.RStringVector;
 
 @TypeSystemReference(RTypes.class)
 public abstract class AsCharNode extends FFIUpCallNode.Arg1 {
@@ -51,14 +53,16 @@ protected CharSXPWrapper asChar(CharSXPWrapper obj) {
     }
 
     @Specialization
-    protected CharSXPWrapper asChar(RStringVector obj, @Cached("createBinaryProfile()") ConditionProfile profile, @Cached("createBinaryProfile()") ConditionProfile naProfile,
-                    @Cached("createBinaryProfile()") ConditionProfile isNativized,
-                    @Cached("createBinaryProfile()") ConditionProfile wrapProfile) {
-        if (profile.profile(obj.getLength() == 0)) {
+    protected CharSXPWrapper asChar(RStringVector obj,
+                    @Cached("createBinaryProfile()") ConditionProfile zeroLengthProfile,
+                    @Cached("createBinaryProfile()") ConditionProfile naProfile,
+                    @CachedLibrary(limit = "getTypedVectorDataLibraryCacheSize()") VectorDataLibrary dataLib) {
+        if (zeroLengthProfile.profile(obj.getLength() == 0)) {
             return CharSXPWrapper_NA;
         } else {
-            obj.wrapStrings(isNativized, wrapProfile);
-            CharSXPWrapper result = obj.getWrappedDataAt(0);
+            Object newCharSXPData = dataLib.materializeCharSXPStorage(obj.getData());
+            obj.setData(newCharSXPData);
+            CharSXPWrapper result = dataLib.getCharSXPAt(obj.getData(), 0);
             return naProfile.profile(RRuntime.isNA(result.getContents())) ? CharSXPWrapper_NA : result;
         }
     }

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/StringEltNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, 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
@@ -62,8 +62,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
-import static com.oracle.truffle.r.runtime.RInternalError.unimplemented;
-
 public final class RDataFactory {
     private abstract static class StaticVectorFactory extends BaseVectorFactory {
 

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

@@ -49,14 +49,6 @@ public CharSXPWrapper[] getData() {
         return data;
     }
 
-    public CharSXPWrapper getWrappedAt(int index) {
-        return data[index];
-    }
-
-    public void setWrappedAt(int index, CharSXPWrapper value) {
-        data[index] = value;
-    }
-
     @ExportMessage
     public NACheck getNACheck() {
         return NACheck.getEnabled();

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

@@ -83,6 +83,11 @@ public RStringVecNativeData materialize() {
         return this;
     }
 
+    @ExportMessage
+    public RStringVecNativeData materializeCharSXPStorage() {
+        return this;
+    }
+
     @ExportMessage
     public boolean isWriteable() {
         return true;
@@ -148,6 +153,21 @@ public String getString(@SuppressWarnings("unused") RandomAccessIterator it, int
         return NativeDataAccess.getData(vec, null, index);
     }
 
+    @ExportMessage
+    public CharSXPWrapper getCharSXPAt(int index) {
+        return data[index];
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getNextCharSXP(SeqIterator it) {
+        return data[it.getIndex()];
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getCharSXP(@SuppressWarnings("unused") RandomAccessIterator it, int index) {
+        return data[index];
+    }
+
     // Write access to the elements:
 
     @ExportMessage
@@ -174,4 +194,19 @@ public void setNextString(SeqWriteIterator it, String value) {
     public void setString(@SuppressWarnings("unused") RandomAccessWriteIterator it, int index, String value) {
         NativeDataAccess.setData(vec, data, index, CharSXPWrapper.create(value));
     }
+
+    @ExportMessage
+    public void setCharSXPAt(int index, CharSXPWrapper value) {
+        data[index] = value;
+    }
+
+    @ExportMessage
+    public void setNextCharSXP(SeqWriteIterator it, CharSXPWrapper value) {
+        data[it.getIndex()] = value;
+    }
+
+    @ExportMessage
+    public void setCharSXP(@SuppressWarnings("unused") RandomAccessWriteIterator it, int index, CharSXPWrapper value) {
+        data[index] = value;
+    }
 }

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

@@ -22,8 +22,6 @@
  */
 package com.oracle.truffle.r.runtime.data;
 
-import java.util.Arrays;
-
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -53,6 +51,8 @@
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 import com.oracle.truffle.r.runtime.ops.na.NACheck;
 
+import java.util.Arrays;
+
 @ExportLibrary(InteropLibrary.class)
 @ExportLibrary(AbstractContainerLibrary.class)
 public final class RStringVector extends RAbstractAtomicVector implements RMaterializedVector, Shareable {
@@ -122,8 +122,7 @@ public static RStringVector createAltString(AltStringClassDescriptor descriptor,
         altStringVector.setAltRep();
         altStringVector.data = altStringVecData;
         // This is a workaround, because we already have to invoke some altrep methods in
-        // getLengthMethodUncached
-        // and for that we need non-null owner.
+        // getLengthMethodUncached and for that we need non-null owner.
         altStringVecData.setOwner(altStringVector);
         int length = AltrepUtilities.getLengthUncached(altStringVector);
         altStringVector.setData(altStringVecData, length);
@@ -390,7 +389,7 @@ public Object getDataAtAsObject(int index) {
     public void setElement(int i, Object value) {
         assert value instanceof CharSXPWrapper;
         wrapStrings();
-        setWrappedDataAt(i, (CharSXPWrapper) value);
+        VectorDataLibrary.getFactory().getUncached().setCharSXPAt(data, i, (CharSXPWrapper) value);
     }
 
     /**
@@ -424,39 +423,19 @@ public void wrapStrings() {
      * wrapped.
      */
     @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification = "intentional")
-    public void wrapStrings(ConditionProfile isNativized, ConditionProfile needsWrapping) {
+    public void wrapStrings(ConditionProfile isNativized, ConditionProfile isWrapped) {
         if (isNativized.profile(!isNativized())) {
-            Object oldData = data;
-            if (needsWrapping.profile(oldData instanceof RStringCharSXPData)) {
+            VectorDataLibrary dataLib = getUncachedDataLib();
+            Object newCharSXPData = dataLib.materializeCharSXPStorage(data);
+            if (isWrapped.profile(newCharSXPData == data)) {
                 return;
             }
-            oldData = getUncachedDataLib().materialize(oldData);
-            Object newData = ((RStringArrayVectorData) oldData).wrapStrings();
             fence = 42; // make sure the array is really initialized before we set it to this.data
-            setData(newData, getUncachedDataLib().getLength(newData));
+            setData(newCharSXPData, dataLib.getLength(newCharSXPData));
         }
         verifyData();
     }
 
-    public CharSXPWrapper getWrappedDataAt(int index) {
-        if (!isNativized()) {
-            assert data instanceof RStringCharSXPData : "wrap the string vector data with wrapStrings() before using getWrappedDataAt(int)";
-            return ((RStringCharSXPData) data).getWrappedAt(index);
-        } else {
-            return NativeDataAccess.getStringNativeMirrorData(getNativeMirror(), index);
-        }
-    }
-
-    public void setWrappedDataAt(int index, CharSXPWrapper elem) {
-        if (!isNativized()) {
-            wrapStrings();
-            assert data instanceof RStringCharSXPData : "wrap the string vector data with wrapStrings() before using getWrappedDataAt(int)";
-            ((RStringCharSXPData) data).setWrappedAt(index, elem);
-        } else {
-            ((RStringVecNativeData) data).setWrappedStringAt(index, elem);
-        }
-    }
-
     protected static RStringVector createStringVector(Object[] vecData, boolean isComplete, int[] dims) {
         if (vecData instanceof String[]) {
             return RDataFactory.createStringVector((String[]) vecData, isComplete, dims);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -373,19 +373,19 @@ public RStringCharSXPData materializeCharSXPStorage(@CachedLibrary("this.data")
 
     @ExportMessage
     public CharSXPWrapper getCharSXPAt(int index,
-                        @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+                    @CachedLibrary("this.data") VectorDataLibrary dataLib) {
         return dataLib.getCharSXPAt(data, index);
     }
 
     @ExportMessage
     public CharSXPWrapper getNextCharSXP(SeqIterator it,
-                        @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+                    @CachedLibrary("this.data") VectorDataLibrary dataLib) {
         return dataLib.getNextCharSXP(data, it);
     }
 
     @ExportMessage
     public CharSXPWrapper getCharSXP(RandomAccessIterator it, int index,
-                        @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+                    @CachedLibrary("this.data") VectorDataLibrary dataLib) {
         return dataLib.getCharSXP(data, it, index);
     }
 

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

@@ -150,6 +150,9 @@ public boolean isWriteable(Object data) {
      * Similarly to {@link #materialize(Object)}, returns an instance of object that implements
      * {@link VectorDataLibrary}. Moreover, the receiver should transform into an object containing
      * {@link CharSXPWrapper} data, if possible.
+     *
+     * If the result is the same as the {@code data}, it means that the receiver already has
+     * materialized CharSXP storage.
      * 
      * @see #materialize(Object)
      */