generated test outputmove warnings management from Fast/SlowPathAccess to the iterators

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

@@ -155,21 +155,21 @@ public final class RComplex extends RScalarVector implements RAbstractComplexVec
         }
 
         @Override
-        protected RComplex getComplex(Object store, int index) {
+        protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return (RComplex) store;
+            return (RComplex) accessIter.getStore();
         }
 
         @Override
-        protected double getComplexR(Object store, int index) {
+        protected double getComplexRImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RComplex) store).realPart;
+            return ((RComplex) accessIter.getStore()).realPart;
         }
 
         @Override
-        protected double getComplexI(Object store, int index) {
+        protected double getComplexIImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RComplex) store).imaginaryPart;
+            return ((RComplex) accessIter.getStore()).imaginaryPart;
         }
     }
 
@@ -180,21 +180,21 @@ public final class RComplex extends RScalarVector implements RAbstractComplexVec
 
     private static final SlowPathFromComplexAccess SLOW_PATH_ACCESS = new SlowPathFromComplexAccess() {
         @Override
-        protected RComplex getComplex(Object store, int index) {
+        protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return (RComplex) store;
+            return (RComplex) accessIter.getStore();
         }
 
         @Override
-        protected double getComplexR(Object store, int index) {
+        protected double getComplexRImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RComplex) store).realPart;
+            return ((RComplex) accessIter.getStore()).realPart;
         }
 
         @Override
-        protected double getComplexI(Object store, int index) {
+        protected double getComplexIImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RComplex) store).imaginaryPart;
+            return ((RComplex) accessIter.getStore()).imaginaryPart;
         }
     };
 

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

@@ -235,22 +235,23 @@ public final class RComplexVector extends RVector<double[]> implements RAbstract
         }
 
         @Override
-        protected RComplex getComplex(Object store, int index) {
-            return RComplex.valueOf(getComplexR(store, index), getComplexI(store, index));
+        protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
+            return RComplex.valueOf(getComplexRImpl(accessIter, index), getComplexIImpl(accessIter, index));
         }
 
         @Override
-        protected double getComplexR(Object store, int index) {
-            return hasStore ? ((double[]) store)[index * 2] : NativeDataAccess.getDoubleNativeMirrorData(store, index * 2);
+        protected double getComplexRImpl(AccessIterator accessIter, int index) {
+            return hasStore ? ((double[]) accessIter.getStore())[index * 2] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index * 2);
         }
 
         @Override
-        protected double getComplexI(Object store, int index) {
-            return hasStore ? ((double[]) store)[index * 2 + 1] : NativeDataAccess.getDoubleNativeMirrorData(store, index * 2 + 1);
+        protected double getComplexIImpl(AccessIterator accessIter, int index) {
+            return hasStore ? ((double[]) accessIter.getStore())[index * 2 + 1] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index * 2 + 1);
         }
 
         @Override
-        protected void setComplex(Object store, int index, double real, double imaginary) {
+        protected void setComplexImpl(AccessIterator accessIter, int index, double real, double imaginary) {
+            Object store = accessIter.getStore();
             if (hasStore) {
                 ((double[]) store)[index * 2] = real;
                 ((double[]) store)[index * 2 + 1] = imaginary;
@@ -268,26 +269,26 @@ public final class RComplexVector extends RVector<double[]> implements RAbstract
 
     private static final SlowPathFromComplexAccess SLOW_PATH_ACCESS = new SlowPathFromComplexAccess() {
         @Override
-        protected RComplex getComplex(Object store, int index) {
-            RComplexVector vector = (RComplexVector) store;
+        protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
+            RComplexVector vector = (RComplexVector) accessIter.getStore();
             return NativeDataAccess.getData(vector, vector.data, index);
         }
 
         @Override
-        protected double getComplexR(Object store, int index) {
-            RComplexVector vector = (RComplexVector) store;
+        protected double getComplexRImpl(AccessIterator accessIter, int index) {
+            RComplexVector vector = (RComplexVector) accessIter.getStore();
             return NativeDataAccess.getDataR(vector, vector.data, index);
         }
 
         @Override
-        protected double getComplexI(Object store, int index) {
-            RComplexVector vector = (RComplexVector) store;
+        protected double getComplexIImpl(AccessIterator accessIter, int index) {
+            RComplexVector vector = (RComplexVector) accessIter.getStore();
             return NativeDataAccess.getDataI(vector, vector.data, index);
         }
 
         @Override
-        protected void setComplex(Object store, int index, double real, double imaginary) {
-            RComplexVector vector = (RComplexVector) store;
+        protected void setComplexImpl(AccessIterator accessIter, int index, double real, double imaginary) {
+            RComplexVector vector = (RComplexVector) accessIter.getStore();
             NativeDataAccess.setData(vector, vector.data, index, real, imaginary);
         }
     };

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

@@ -111,9 +111,9 @@ public final class RDouble extends RScalarVector implements RAbstractDoubleVecto
         }
 
         @Override
-        protected double getDouble(Object store, int index) {
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RDouble) store).value;
+            return ((RDouble) accessIter.getStore()).value;
         }
     }
 
@@ -124,9 +124,9 @@ public final class RDouble extends RScalarVector implements RAbstractDoubleVecto
 
     private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
         @Override
-        protected double getDouble(Object store, int index) {
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RDouble) store).value;
+            return ((RDouble) accessIter.getStore()).value;
         }
     };
 

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

@@ -146,8 +146,8 @@ public final class RDoubleSequence extends RSequence implements RAbstractDoubleV
         }
 
         @Override
-        protected double getDouble(Object store, int index) {
-            RDoubleSequence vector = (RDoubleSequence) store;
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
+            RDoubleSequence vector = (RDoubleSequence) accessIter.getStore();
             assert index >= 0 && index < vector.getLength();
             return vector.start + vector.stride * index;
         }
@@ -160,8 +160,8 @@ public final class RDoubleSequence extends RSequence implements RAbstractDoubleV
 
     private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
         @Override
-        protected double getDouble(Object store, int index) {
-            RDoubleSequence vector = (RDoubleSequence) store;
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
+            RDoubleSequence vector = (RDoubleSequence) accessIter.getStore();
             assert index >= 0 && index < vector.getLength();
             return vector.start + vector.stride * index;
         }

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

@@ -260,16 +260,16 @@ public final class RDoubleVector extends RVector<double[]> implements RAbstractD
         }
 
         @Override
-        protected double getDouble(Object store, int index) {
-            return hasStore ? ((double[]) store)[index] : NativeDataAccess.getDoubleNativeMirrorData(store, index);
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
+            return hasStore ? ((double[]) accessIter.getStore())[index] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index);
         }
 
         @Override
-        protected void setDouble(Object store, int index, double value) {
+        protected void setDoubleImpl(AccessIterator accessIter, int index, double value) {
             if (hasStore) {
-                ((double[]) store)[index] = value;
+                ((double[]) accessIter.getStore())[index] = value;
             } else {
-                NativeDataAccess.setNativeMirrorDoubleData(store, index, value);
+                NativeDataAccess.setNativeMirrorDoubleData(accessIter.getStore(), index, value);
             }
         }
     }
@@ -281,14 +281,14 @@ public final class RDoubleVector extends RVector<double[]> implements RAbstractD
 
     private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
         @Override
-        protected double getDouble(Object store, int index) {
-            RDoubleVector vector = (RDoubleVector) store;
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
+            RDoubleVector vector = (RDoubleVector) accessIter.getStore();
             return NativeDataAccess.getData(vector, vector.data, index);
         }
 
         @Override
-        protected void setDouble(Object store, int index, double value) {
-            RDoubleVector vector = (RDoubleVector) store;
+        protected void setDoubleImpl(AccessIterator accessIter, int index, double value) {
+            RDoubleVector vector = (RDoubleVector) accessIter.getStore();
             NativeDataAccess.setData(vector, vector.data, index, value);
         }
     };

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

@@ -101,13 +101,13 @@ public final class RExpression extends RListBase implements RAbstractVector {
         }
 
         @Override
-        protected Object getListElement(Object store, int index) {
-            return ((Object[]) store)[index];
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            return ((Object[]) accessIter.getStore())[index];
         }
 
         @Override
-        protected void setListElement(Object store, int index, Object value) {
-            ((Object[]) store)[index] = value;
+        protected void setListElementImpl(AccessIterator accessIter, int index, Object value) {
+            ((Object[]) accessIter.getStore())[index] = value;
         }
     }
 
@@ -123,13 +123,13 @@ public final class RExpression extends RListBase implements RAbstractVector {
         }
 
         @Override
-        protected Object getListElement(Object store, int index) {
-            return ((RExpression) store).data[index];
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            return ((RExpression) accessIter.getStore()).data[index];
         }
 
         @Override
-        protected void setListElement(Object store, int index, Object value) {
-            ((RExpression) store).data[index] = value;
+        protected void setListElementImpl(AccessIterator accessIter, int index, Object value) {
+            ((RExpression) accessIter.getStore()).data[index] = value;
         }
     };
 

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

@@ -98,10 +98,10 @@ public final class RForeignBooleanWrapper extends RForeignWrapper implements RAb
         }
 
         @Override
-        protected byte getLogical(Object internalStore, int index) {
+        protected byte getLogicalImpl(AccessIterator accessIter, int index) {
             Object value = null;
             try {
-                value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
+                value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
                 return RRuntime.asLogical((boolean) value);
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {
                 throw RInternalError.shouldNotReachHere(e);
@@ -137,8 +137,8 @@ public final class RForeignBooleanWrapper extends RForeignWrapper implements RAb
         }
 
         @Override
-        protected byte getLogical(Object store, int index) {
-            RForeignBooleanWrapper vector = (RForeignBooleanWrapper) store;
+        protected byte getLogicalImpl(AccessIterator accessIter, int index) {
+            RForeignBooleanWrapper vector = (RForeignBooleanWrapper) accessIter.getStore();
             Object value = null;
             try {
                 value = ForeignAccess.sendRead(READ, vector.delegate, index);

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

@@ -101,10 +101,10 @@ public final class RForeignDoubleWrapper extends RForeignWrapper implements RAbs
         }
 
         @Override
-        protected double getDouble(Object internalStore, int index) {
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
             Object value = null;
             try {
-                value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
+                value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
                 return ((Number) resultProfile.profile(value)).doubleValue();
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {
                 throw RInternalError.shouldNotReachHere(e);
@@ -131,7 +131,7 @@ public final class RForeignDoubleWrapper extends RForeignWrapper implements RAbs
     private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
         @Override
         @TruffleBoundary
-        protected int getLength(RAbstractContainer vector) {
+        public int getLength(RAbstractContainer vector) {
             try {
                 return (int) ForeignAccess.sendGetSize(GET_SIZE, ((RForeignDoubleWrapper) vector).delegate);
             } catch (UnsupportedMessageException e) {
@@ -140,8 +140,8 @@ public final class RForeignDoubleWrapper extends RForeignWrapper implements RAbs
         }
 
         @Override
-        protected double getDouble(Object store, int index) {
-            RForeignDoubleWrapper vector = (RForeignDoubleWrapper) store;
+        protected double getDoubleImpl(AccessIterator accessIter, int index) {
+            RForeignDoubleWrapper vector = (RForeignDoubleWrapper) accessIter.getStore();
             Object value = null;
             try {
                 value = ForeignAccess.sendRead(READ, vector.delegate, index);

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

@@ -100,10 +100,10 @@ public final class RForeignIntWrapper extends RForeignWrapper implements RAbstra
         }
 
         @Override
-        protected int getInt(Object internalStore, int index) {
+        public int getIntImpl(AccessIterator accessIter, int index) {
             Object value = null;
             try {
-                value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
+                value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
                 return ((Number) resultProfile.profile(value)).intValue();
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {
                 throw RInternalError.shouldNotReachHere(e);
@@ -139,8 +139,8 @@ public final class RForeignIntWrapper extends RForeignWrapper implements RAbstra
         }
 
         @Override
-        protected int getInt(Object store, int index) {
-            RForeignIntWrapper vector = (RForeignIntWrapper) store;
+        public int getIntImpl(AccessIterator accessIter, int index) {
+            RForeignIntWrapper vector = (RForeignIntWrapper) accessIter.getStore();
             Object value = null;
             try {
                 value = ForeignAccess.sendRead(READ, vector.delegate, index);

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

@@ -90,9 +90,9 @@ public final class RForeignListWrapper extends RForeignWrapper implements RAbstr
         }
 
         @Override
-        protected Object getListElement(Object internalStore, int index) {
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
             try {
-                return foreign2r.execute(ForeignAccess.sendRead(read, (TruffleObject) internalStore, index));
+                return foreign2r.execute(ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index));
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {
                 throw RInternalError.shouldNotReachHere(e);
             }
@@ -124,8 +124,8 @@ public final class RForeignListWrapper extends RForeignWrapper implements RAbstr
         }
 
         @Override
-        protected Object getListElement(Object store, int index) {
-            RForeignListWrapper vector = (RForeignListWrapper) store;
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            RForeignListWrapper vector = (RForeignListWrapper) accessIter.getStore();
             try {
                 return FOREIGN_TO_R.execute(ForeignAccess.sendRead(READ, vector.delegate, index));
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {

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

@@ -103,9 +103,9 @@ public final class RForeignNamedListWrapper extends RForeignWrapper implements R
         }
 
         @Override
-        protected Object getListElement(Object internalStore, int index) {
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
             try {
-                RForeignNamedListWrapper wrapper = (RForeignNamedListWrapper) internalStore;
+                RForeignNamedListWrapper wrapper = (RForeignNamedListWrapper) accessIter.getStore();
                 return foreign2r.execute(ForeignAccess.sendRead(read, wrapper.delegate, wrapper.names.getDataAt(index)));
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {
                 throw RInternalError.shouldNotReachHere(e);
@@ -133,8 +133,8 @@ public final class RForeignNamedListWrapper extends RForeignWrapper implements R
         }
 
         @Override
-        protected Object getListElement(Object store, int index) {
-            RForeignNamedListWrapper vector = (RForeignNamedListWrapper) store;
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            RForeignNamedListWrapper vector = (RForeignNamedListWrapper) accessIter.getStore();
             try {
                 return FOREIGN_TO_R.execute(ForeignAccess.sendRead(READ, vector.delegate, vector.names.getDataAt(index)));
             } catch (UnsupportedMessageException | UnknownIdentifierException e) {

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

@@ -99,9 +99,9 @@ public final class RForeignStringWrapper extends RForeignWrapper implements RAbs
         }
 
         @Override
-        protected String getString(Object internalStore, int index) {
+        protected String getStringImpl(AccessIterator accessIter, int index) {
             try {
-                Object value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
+                Object value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
                 if (isNullProfile.profile(value instanceof TruffleObject)) {
                     if (isNull == null) {
                         CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -136,8 +136,8 @@ public final class RForeignStringWrapper extends RForeignWrapper implements RAbs
 
         @Override
         @TruffleBoundary
-        protected String getString(Object store, int index) {
-            RForeignStringWrapper vector = (RForeignStringWrapper) store;
+        protected String getStringImpl(AccessIterator accessIter, int index) {
+            RForeignStringWrapper vector = (RForeignStringWrapper) accessIter.getStore();
             return RForeignStringWrapper.getString(vector.delegate, index);
         }
     };

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

@@ -155,8 +155,8 @@ public final class RIntSequence extends RSequence implements RAbstractIntVector
         }
 
         @Override
-        protected int getInt(Object store, int index) {
-            RIntSequence vector = (RIntSequence) store;
+        public int getIntImpl(AccessIterator accessIter, int index) {
+            RIntSequence vector = (RIntSequence) accessIter.getStore();
             assert index >= 0 && index < vector.getLength();
             return vector.start + vector.stride * index;
         }
@@ -169,8 +169,8 @@ public final class RIntSequence extends RSequence implements RAbstractIntVector
 
     private static final SlowPathFromIntAccess SLOW_PATH_ACCESS = new SlowPathFromIntAccess() {
         @Override
-        protected int getInt(Object store, int index) {
-            RIntSequence vector = (RIntSequence) store;
+        public int getIntImpl(AccessIterator accessIter, int index) {
+            RIntSequence vector = (RIntSequence) accessIter.getStore();
             assert index >= 0 && index < vector.getLength();
             return vector.start + vector.stride * index;
         }

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

@@ -268,16 +268,16 @@ public final class RIntVector extends RVector<int[]> implements RAbstractIntVect
         }
 
         @Override
-        protected int getInt(Object store, int index) {
-            return hasStore ? ((int[]) store)[index] : NativeDataAccess.getIntNativeMirrorData(store, index);
+        public int getIntImpl(AccessIterator accessIter, int index) {
+            return hasStore ? ((int[]) accessIter.getStore())[index] : NativeDataAccess.getIntNativeMirrorData(accessIter.getStore(), index);
         }
 
         @Override
-        protected void setInt(Object store, int index, int value) {
+        protected void setIntImpl(AccessIterator accessIter, int index, int value) {
             if (hasStore) {
-                ((int[]) store)[index] = value;
+                ((int[]) accessIter.getStore())[index] = value;
             } else {
-                NativeDataAccess.setNativeMirrorIntData(store, index, value);
+                NativeDataAccess.setNativeMirrorIntData(accessIter.getStore(), index, value);
             }
         }
     }
@@ -289,14 +289,14 @@ public final class RIntVector extends RVector<int[]> implements RAbstractIntVect
 
     private static final SlowPathFromIntAccess SLOW_PATH_ACCESS = new SlowPathFromIntAccess() {
         @Override
-        protected int getInt(Object store, int index) {
-            RIntVector vector = (RIntVector) store;
+        public int getIntImpl(AccessIterator accessIter, int index) {
+            RIntVector vector = (RIntVector) accessIter.getStore();
             return NativeDataAccess.getData(vector, vector.data, index);
         }
 
         @Override
-        protected void setInt(Object store, int index, int value) {
-            RIntVector vector = (RIntVector) store;
+        protected void setIntImpl(AccessIterator accessIter, int index, int value) {
+            RIntVector vector = (RIntVector) accessIter.getStore();
             NativeDataAccess.setData(vector, vector.data, index, value);
         }
     };

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

@@ -107,9 +107,9 @@ public final class RInteger extends RScalarVector implements RAbstractIntVector
         }
 
         @Override
-        protected int getInt(Object store, int index) {
+        public int getIntImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RInteger) store).value;
+            return ((RInteger) accessIter.getStore()).value;
         }
     }
 
@@ -120,9 +120,9 @@ public final class RInteger extends RScalarVector implements RAbstractIntVector
 
     private static final SlowPathFromIntAccess SLOW_PATH_ACCESS = new SlowPathFromIntAccess() {
         @Override
-        protected int getInt(Object store, int index) {
+        public int getIntImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RInteger) store).value;
+            return ((RInteger) accessIter.getStore()).value;
         }
     };
 

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

@@ -105,13 +105,13 @@ public final class RList extends RListBase implements RAbstractListVector {
         }
 
         @Override
-        protected Object getListElement(Object store, int index) {
-            return ((Object[]) store)[index];
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            return ((Object[]) accessIter.getStore())[index];
         }
 
         @Override
-        protected void setListElement(Object store, int index, Object value) {
-            ((Object[]) store)[index] = value;
+        protected void setListElementImpl(AccessIterator accessIter, int index, Object value) {
+            ((Object[]) accessIter.getStore())[index] = value;
         }
     }
 
@@ -127,13 +127,13 @@ public final class RList extends RListBase implements RAbstractListVector {
         }
 
         @Override
-        protected Object getListElement(Object store, int index) {
-            return ((RList) store).data[index];
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            return ((RList) accessIter.getStore()).data[index];
         }
 
         @Override
-        protected void setListElement(Object store, int index, Object value) {
-            ((RList) store).data[index] = value;
+        protected void setListElementImpl(AccessIterator accessIter, int index, Object value) {
+            ((RList) accessIter.getStore()).data[index] = value;
         }
     };
 

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

@@ -117,9 +117,9 @@ public final class RLogical extends RScalarVector implements RAbstractLogicalVec
         }
 
         @Override
-        protected byte getLogical(Object store, int index) {
+        protected byte getLogicalImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RLogical) store).value;
+            return ((RLogical) accessIter.getStore()).value;
         }
     }
 
@@ -130,9 +130,9 @@ public final class RLogical extends RScalarVector implements RAbstractLogicalVec
 
     private static final SlowPathFromLogicalAccess SLOW_PATH_ACCESS = new SlowPathFromLogicalAccess() {
         @Override
-        protected byte getLogical(Object store, int index) {
+        protected byte getLogicalImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RLogical) store).value;
+            return ((RLogical) accessIter.getStore()).value;
         }
     };
 

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

@@ -271,16 +271,16 @@ public final class RLogicalVector extends RVector<byte[]> implements RAbstractLo
         }
 
         @Override
-        protected byte getLogical(Object store, int index) {
-            return hasStore ? ((byte[]) store)[index] : NativeDataAccess.getLogicalNativeMirrorData(store, index);
+        protected byte getLogicalImpl(AccessIterator accessIter, int index) {
+            return hasStore ? ((byte[]) accessIter.getStore())[index] : NativeDataAccess.getLogicalNativeMirrorData(accessIter.getStore(), index);
         }
 
         @Override
-        protected void setLogical(Object store, int index, byte value) {
+        protected void setLogicalImpl(AccessIterator accessIter, int index, byte value) {
             if (hasStore) {
-                ((byte[]) store)[index] = value;
+                ((byte[]) accessIter.getStore())[index] = value;
             } else {
-                NativeDataAccess.setNativeMirrorLogicalData(store, index, value);
+                NativeDataAccess.setNativeMirrorLogicalData(accessIter.getStore(), index, value);
             }
         }
     }
@@ -292,14 +292,14 @@ public final class RLogicalVector extends RVector<byte[]> implements RAbstractLo
 
     private static final SlowPathFromLogicalAccess SLOW_PATH_ACCESS = new SlowPathFromLogicalAccess() {
         @Override
-        protected byte getLogical(Object store, int index) {
-            RLogicalVector vector = (RLogicalVector) store;
+        protected byte getLogicalImpl(AccessIterator accessIter, int index) {
+            RLogicalVector vector = (RLogicalVector) accessIter.getStore();
             return NativeDataAccess.getData(vector, vector.data, index);
         }
 
         @Override
-        protected void setLogical(Object store, int index, byte value) {
-            RLogicalVector vector = (RLogicalVector) store;
+        protected void setLogicalImpl(AccessIterator accessIter, int index, byte value) {
+            RLogicalVector vector = (RLogicalVector) accessIter.getStore();
             NativeDataAccess.setData(vector, vector.data, index, value);
         }
     };

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

@@ -907,8 +907,8 @@ public final class RPairList extends RSharingAttributeStorage implements RAbstra
 
         @TruffleBoundary
         @Override
-        protected Object getListElement(Object store, int index) {
-            return ((RPairList) store).getDataAtAsObject(index);
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            return ((RPairList) accessIter.getStore()).getDataAtAsObject(index);
         }
     }
 
@@ -925,8 +925,8 @@ public final class RPairList extends RSharingAttributeStorage implements RAbstra
 
         @TruffleBoundary
         @Override
-        protected Object getListElement(Object store, int index) {
-            return ((RPairList) store).getDataAtAsObject(index);
+        protected Object getListElementImpl(AccessIterator accessIter, int index) {
+            return ((RPairList) accessIter.getStore()).getDataAtAsObject(index);
         }
     };
 

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

@@ -111,9 +111,9 @@ public final class RRaw extends RScalarVector implements RAbstractRawVector {
         }
 
         @Override
-        protected byte getRaw(Object store, int index) {
+        protected byte getRawImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RRaw) store).value;
+            return ((RRaw) accessIter.getStore()).value;
         }
     }
 
@@ -124,9 +124,9 @@ public final class RRaw extends RScalarVector implements RAbstractRawVector {
 
     private static final SlowPathFromRawAccess SLOW_PATH_ACCESS = new SlowPathFromRawAccess() {
         @Override
-        protected byte getRaw(Object store, int index) {
+        protected byte getRawImpl(AccessIterator accessIter, int index) {
             assert index == 0;
-            return ((RRaw) store).value;
+            return ((RRaw) accessIter.getStore()).value;
         }
     };