RStringVecNativeData accesses its data via NativeDataAccess

(cherry picked from commit 2d89c39)

Author: Pavel Marek

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

@@ -1121,34 +1121,8 @@ static int getDataLength(RStringVector vector, Object[] data) {
         }
     }
 
-    static String getData(RStringVector vector, Object data, int index) {
-        if (noStringNative.isValid() || data != null) {
-            Object localData = data;
-            if (localData instanceof String[]) {
-                return ((String[]) localData)[index];
-            }
-            assert data instanceof CharSXPWrapper[] : localData;
-            assert ((CharSXPWrapper[]) localData)[index] != null;
-            return ((CharSXPWrapper[]) localData)[index].getContents();
-        } else {
-            return getStringNativeMirrorData(vector.getNativeMirror(), index).getContents();
-        }
-    }
-
-    static void setData(RStringVector vector, Object data, int index, String value) {
-        assert data != null;
-        if (data instanceof String[]) {
-            assert !vector.isNativized();
-            ((String[]) data)[index] = value;
-        } else {
-            assert data instanceof CharSXPWrapper[] : data;
-            CharSXPWrapper elem = CharSXPWrapper.create(value);
-            ((CharSXPWrapper[]) data)[index] = elem;
-
-            if (!noStringNative.isValid() && vector.isNativized()) {
-                NativeDataAccess.setNativeMirrorStringData(vector.getNativeMirror(), index, elem);
-            }
-        }
+    static CharSXPWrapper getData(RStringVector vector, int index) {
+        return getStringNativeMirrorData(vector.getNativeMirror(), index);
     }
 
     static void setData(RStringVector vector, CharSXPWrapper[] data, int index, CharSXPWrapper value) {

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

@@ -46,7 +46,10 @@ public class RStringVecNativeData implements TruffleObject, ShareableVectorData
 
     /**
      * After nativized, the data array degenerates to a reference holder, which prevents the objects
-     * from being GC'ed. If the native code copies data of one string vector to another without
+     * from being GC'ed. This means that if someone changes the order of the CHARSXP elements on the native
+     * side, this modification is not reflected in this reference holder array.
+     *
+     * If the native code copies data of one string vector to another without
      * using the proper API, we are doomed.
      */
     private final CharSXPWrapper[] data;
@@ -140,32 +143,32 @@ public RandomAccessIterator randomAccessIterator() {
 
     @ExportMessage
     public String getStringAt(int index) {
-        return NativeDataAccess.getData(vec, null, index);
+        return NativeDataAccess.getData(vec, index).getContents();
     }
 
     @ExportMessage
     public String getNextString(SeqIterator it) {
-        return NativeDataAccess.getData(vec, null, it.getIndex());
+        return NativeDataAccess.getData(vec, it.getIndex()).getContents();
     }
 
     @ExportMessage
     public String getString(@SuppressWarnings("unused") RandomAccessIterator it, int index) {
-        return NativeDataAccess.getData(vec, null, index);
+        return NativeDataAccess.getData(vec, index).getContents();
     }
 
     @ExportMessage
     public CharSXPWrapper getCharSXPAt(int index) {
-        return data[index];
+        return NativeDataAccess.getData(vec, index);
     }
 
     @ExportMessage
     public CharSXPWrapper getNextCharSXP(SeqIterator it) {
-        return data[it.getIndex()];
+        return NativeDataAccess.getData(vec, it.getIndex());
     }
 
     @ExportMessage
     public CharSXPWrapper getCharSXP(@SuppressWarnings("unused") RandomAccessIterator it, int index) {
-        return data[index];
+        return NativeDataAccess.getData(vec, index);
     }
 
     // Write access to the elements:
@@ -197,16 +200,16 @@ public void setString(@SuppressWarnings("unused") RandomAccessWriteIterator it,
 
     @ExportMessage
     public void setCharSXPAt(int index, CharSXPWrapper value) {
-        data[index] = value;
+        NativeDataAccess.setData(vec, data, index, value);
     }
 
     @ExportMessage
     public void setNextCharSXP(SeqWriteIterator it, CharSXPWrapper value) {
-        data[it.getIndex()] = value;
+        NativeDataAccess.setData(vec, data, it.getIndex(), value);
     }
 
     @ExportMessage
     public void setCharSXP(@SuppressWarnings("unused") RandomAccessWriteIterator it, int index, CharSXPWrapper value) {
-        data[index] = value;
+        NativeDataAccess.setData(vec, data, index, value);
     }
 }