Skip to content

Commit f661064

Browse files
tomasstupkatomasstupka
committed
[GR-7441] VectorAccess warnings reporting and recast of CastNodes.
PullRequest: fastr/1616
2 parents 5a1d0a2 + 1f277de commit f661064

33 files changed

+675
-640
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,21 @@ private static final class FastPathAccess extends FastPathFromComplexAccess {
155155
}
156156

157157
@Override
158-
protected RComplex getComplex(Object store, int index) {
158+
protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
159159
assert index == 0;
160-
return (RComplex) store;
160+
return (RComplex) accessIter.getStore();
161161
}
162162

163163
@Override
164-
protected double getComplexR(Object store, int index) {
164+
protected double getComplexRImpl(AccessIterator accessIter, int index) {
165165
assert index == 0;
166-
return ((RComplex) store).realPart;
166+
return ((RComplex) accessIter.getStore()).realPart;
167167
}
168168

169169
@Override
170-
protected double getComplexI(Object store, int index) {
170+
protected double getComplexIImpl(AccessIterator accessIter, int index) {
171171
assert index == 0;
172-
return ((RComplex) store).imaginaryPart;
172+
return ((RComplex) accessIter.getStore()).imaginaryPart;
173173
}
174174
}
175175

@@ -180,21 +180,21 @@ public VectorAccess access() {
180180

181181
private static final SlowPathFromComplexAccess SLOW_PATH_ACCESS = new SlowPathFromComplexAccess() {
182182
@Override
183-
protected RComplex getComplex(Object store, int index) {
183+
protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
184184
assert index == 0;
185-
return (RComplex) store;
185+
return (RComplex) accessIter.getStore();
186186
}
187187

188188
@Override
189-
protected double getComplexR(Object store, int index) {
189+
protected double getComplexRImpl(AccessIterator accessIter, int index) {
190190
assert index == 0;
191-
return ((RComplex) store).realPart;
191+
return ((RComplex) accessIter.getStore()).realPart;
192192
}
193193

194194
@Override
195-
protected double getComplexI(Object store, int index) {
195+
protected double getComplexIImpl(AccessIterator accessIter, int index) {
196196
assert index == 0;
197-
return ((RComplex) store).imaginaryPart;
197+
return ((RComplex) accessIter.getStore()).imaginaryPart;
198198
}
199199
};
200200

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -235,22 +235,23 @@ private static final class FastPathAccess extends FastPathFromComplexAccess {
235235
}
236236

237237
@Override
238-
protected RComplex getComplex(Object store, int index) {
239-
return RComplex.valueOf(getComplexR(store, index), getComplexI(store, index));
238+
protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
239+
return RComplex.valueOf(getComplexRImpl(accessIter, index), getComplexIImpl(accessIter, index));
240240
}
241241

242242
@Override
243-
protected double getComplexR(Object store, int index) {
244-
return hasStore ? ((double[]) store)[index * 2] : NativeDataAccess.getDoubleNativeMirrorData(store, index * 2);
243+
protected double getComplexRImpl(AccessIterator accessIter, int index) {
244+
return hasStore ? ((double[]) accessIter.getStore())[index * 2] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index * 2);
245245
}
246246

247247
@Override
248-
protected double getComplexI(Object store, int index) {
249-
return hasStore ? ((double[]) store)[index * 2 + 1] : NativeDataAccess.getDoubleNativeMirrorData(store, index * 2 + 1);
248+
protected double getComplexIImpl(AccessIterator accessIter, int index) {
249+
return hasStore ? ((double[]) accessIter.getStore())[index * 2 + 1] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index * 2 + 1);
250250
}
251251

252252
@Override
253-
protected void setComplex(Object store, int index, double real, double imaginary) {
253+
protected void setComplexImpl(AccessIterator accessIter, int index, double real, double imaginary) {
254+
Object store = accessIter.getStore();
254255
if (hasStore) {
255256
((double[]) store)[index * 2] = real;
256257
((double[]) store)[index * 2 + 1] = imaginary;
@@ -268,26 +269,26 @@ public VectorAccess access() {
268269

269270
private static final SlowPathFromComplexAccess SLOW_PATH_ACCESS = new SlowPathFromComplexAccess() {
270271
@Override
271-
protected RComplex getComplex(Object store, int index) {
272-
RComplexVector vector = (RComplexVector) store;
272+
protected RComplex getComplexImpl(AccessIterator accessIter, int index) {
273+
RComplexVector vector = (RComplexVector) accessIter.getStore();
273274
return NativeDataAccess.getData(vector, vector.data, index);
274275
}
275276

276277
@Override
277-
protected double getComplexR(Object store, int index) {
278-
RComplexVector vector = (RComplexVector) store;
278+
protected double getComplexRImpl(AccessIterator accessIter, int index) {
279+
RComplexVector vector = (RComplexVector) accessIter.getStore();
279280
return NativeDataAccess.getDataR(vector, vector.data, index);
280281
}
281282

282283
@Override
283-
protected double getComplexI(Object store, int index) {
284-
RComplexVector vector = (RComplexVector) store;
284+
protected double getComplexIImpl(AccessIterator accessIter, int index) {
285+
RComplexVector vector = (RComplexVector) accessIter.getStore();
285286
return NativeDataAccess.getDataI(vector, vector.data, index);
286287
}
287288

288289
@Override
289-
protected void setComplex(Object store, int index, double real, double imaginary) {
290-
RComplexVector vector = (RComplexVector) store;
290+
protected void setComplexImpl(AccessIterator accessIter, int index, double real, double imaginary) {
291+
RComplexVector vector = (RComplexVector) accessIter.getStore();
291292
NativeDataAccess.setData(vector, vector.data, index, real, imaginary);
292293
}
293294
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ private static final class FastPathAccess extends FastPathFromDoubleAccess {
111111
}
112112

113113
@Override
114-
protected double getDouble(Object store, int index) {
114+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
115115
assert index == 0;
116-
return ((RDouble) store).value;
116+
return ((RDouble) accessIter.getStore()).value;
117117
}
118118
}
119119

@@ -124,9 +124,9 @@ public VectorAccess access() {
124124

125125
private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
126126
@Override
127-
protected double getDouble(Object store, int index) {
127+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
128128
assert index == 0;
129-
return ((RDouble) store).value;
129+
return ((RDouble) accessIter.getStore()).value;
130130
}
131131
};
132132

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ private static final class FastPathAccess extends FastPathFromDoubleAccess {
146146
}
147147

148148
@Override
149-
protected double getDouble(Object store, int index) {
150-
RDoubleSequence vector = (RDoubleSequence) store;
149+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
150+
RDoubleSequence vector = (RDoubleSequence) accessIter.getStore();
151151
assert index >= 0 && index < vector.getLength();
152152
return vector.start + vector.stride * index;
153153
}
@@ -160,8 +160,8 @@ public VectorAccess access() {
160160

161161
private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
162162
@Override
163-
protected double getDouble(Object store, int index) {
164-
RDoubleSequence vector = (RDoubleSequence) store;
163+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
164+
RDoubleSequence vector = (RDoubleSequence) accessIter.getStore();
165165
assert index >= 0 && index < vector.getLength();
166166
return vector.start + vector.stride * index;
167167
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,16 +260,16 @@ private static final class FastPathAccess extends FastPathFromDoubleAccess {
260260
}
261261

262262
@Override
263-
protected double getDouble(Object store, int index) {
264-
return hasStore ? ((double[]) store)[index] : NativeDataAccess.getDoubleNativeMirrorData(store, index);
263+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
264+
return hasStore ? ((double[]) accessIter.getStore())[index] : NativeDataAccess.getDoubleNativeMirrorData(accessIter.getStore(), index);
265265
}
266266

267267
@Override
268-
protected void setDouble(Object store, int index, double value) {
268+
protected void setDoubleImpl(AccessIterator accessIter, int index, double value) {
269269
if (hasStore) {
270-
((double[]) store)[index] = value;
270+
((double[]) accessIter.getStore())[index] = value;
271271
} else {
272-
NativeDataAccess.setNativeMirrorDoubleData(store, index, value);
272+
NativeDataAccess.setNativeMirrorDoubleData(accessIter.getStore(), index, value);
273273
}
274274
}
275275
}
@@ -281,14 +281,14 @@ public VectorAccess access() {
281281

282282
private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
283283
@Override
284-
protected double getDouble(Object store, int index) {
285-
RDoubleVector vector = (RDoubleVector) store;
284+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
285+
RDoubleVector vector = (RDoubleVector) accessIter.getStore();
286286
return NativeDataAccess.getData(vector, vector.data, index);
287287
}
288288

289289
@Override
290-
protected void setDouble(Object store, int index, double value) {
291-
RDoubleVector vector = (RDoubleVector) store;
290+
protected void setDoubleImpl(AccessIterator accessIter, int index, double value) {
291+
RDoubleVector vector = (RDoubleVector) accessIter.getStore();
292292
NativeDataAccess.setData(vector, vector.data, index, value);
293293
}
294294
};

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ public RType getType() {
101101
}
102102

103103
@Override
104-
protected Object getListElement(Object store, int index) {
105-
return ((Object[]) store)[index];
104+
protected Object getListElementImpl(AccessIterator accessIter, int index) {
105+
return ((Object[]) accessIter.getStore())[index];
106106
}
107107

108108
@Override
109-
protected void setListElement(Object store, int index, Object value) {
110-
((Object[]) store)[index] = value;
109+
protected void setListElementImpl(AccessIterator accessIter, int index, Object value) {
110+
((Object[]) accessIter.getStore())[index] = value;
111111
}
112112
}
113113

@@ -123,13 +123,13 @@ public RType getType() {
123123
}
124124

125125
@Override
126-
protected Object getListElement(Object store, int index) {
127-
return ((RExpression) store).data[index];
126+
protected Object getListElementImpl(AccessIterator accessIter, int index) {
127+
return ((RExpression) accessIter.getStore()).data[index];
128128
}
129129

130130
@Override
131-
protected void setListElement(Object store, int index, Object value) {
132-
((RExpression) store).data[index] = value;
131+
protected void setListElementImpl(AccessIterator accessIter, int index, Object value) {
132+
((RExpression) accessIter.getStore()).data[index] = value;
133133
}
134134
};
135135

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ protected int getLength(RAbstractContainer vector) {
9898
}
9999

100100
@Override
101-
protected byte getLogical(Object internalStore, int index) {
101+
protected byte getLogicalImpl(AccessIterator accessIter, int index) {
102102
Object value = null;
103103
try {
104-
value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
104+
value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
105105
return RRuntime.asLogical((boolean) value);
106106
} catch (UnsupportedMessageException | UnknownIdentifierException e) {
107107
throw RInternalError.shouldNotReachHere(e);
@@ -137,8 +137,8 @@ protected int getLength(RAbstractContainer vector) {
137137
}
138138

139139
@Override
140-
protected byte getLogical(Object store, int index) {
141-
RForeignBooleanWrapper vector = (RForeignBooleanWrapper) store;
140+
protected byte getLogicalImpl(AccessIterator accessIter, int index) {
141+
RForeignBooleanWrapper vector = (RForeignBooleanWrapper) accessIter.getStore();
142142
Object value = null;
143143
try {
144144
value = ForeignAccess.sendRead(READ, vector.delegate, index);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ protected int getLength(RAbstractContainer vector) {
101101
}
102102

103103
@Override
104-
protected double getDouble(Object internalStore, int index) {
104+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
105105
Object value = null;
106106
try {
107-
value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
107+
value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
108108
return ((Number) resultProfile.profile(value)).doubleValue();
109109
} catch (UnsupportedMessageException | UnknownIdentifierException e) {
110110
throw RInternalError.shouldNotReachHere(e);
@@ -131,7 +131,7 @@ public VectorAccess access() {
131131
private static final SlowPathFromDoubleAccess SLOW_PATH_ACCESS = new SlowPathFromDoubleAccess() {
132132
@Override
133133
@TruffleBoundary
134-
protected int getLength(RAbstractContainer vector) {
134+
public int getLength(RAbstractContainer vector) {
135135
try {
136136
return (int) ForeignAccess.sendGetSize(GET_SIZE, ((RForeignDoubleWrapper) vector).delegate);
137137
} catch (UnsupportedMessageException e) {
@@ -140,8 +140,8 @@ protected int getLength(RAbstractContainer vector) {
140140
}
141141

142142
@Override
143-
protected double getDouble(Object store, int index) {
144-
RForeignDoubleWrapper vector = (RForeignDoubleWrapper) store;
143+
protected double getDoubleImpl(AccessIterator accessIter, int index) {
144+
RForeignDoubleWrapper vector = (RForeignDoubleWrapper) accessIter.getStore();
145145
Object value = null;
146146
try {
147147
value = ForeignAccess.sendRead(READ, vector.delegate, index);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ protected int getLength(RAbstractContainer vector) {
100100
}
101101

102102
@Override
103-
protected int getInt(Object internalStore, int index) {
103+
public int getIntImpl(AccessIterator accessIter, int index) {
104104
Object value = null;
105105
try {
106-
value = ForeignAccess.sendRead(read, (TruffleObject) internalStore, index);
106+
value = ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index);
107107
return ((Number) resultProfile.profile(value)).intValue();
108108
} catch (UnsupportedMessageException | UnknownIdentifierException e) {
109109
throw RInternalError.shouldNotReachHere(e);
@@ -139,8 +139,8 @@ protected int getLength(RAbstractContainer vector) {
139139
}
140140

141141
@Override
142-
protected int getInt(Object store, int index) {
143-
RForeignIntWrapper vector = (RForeignIntWrapper) store;
142+
public int getIntImpl(AccessIterator accessIter, int index) {
143+
RForeignIntWrapper vector = (RForeignIntWrapper) accessIter.getStore();
144144
Object value = null;
145145
try {
146146
value = ForeignAccess.sendRead(READ, vector.delegate, index);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ protected int getLength(RAbstractContainer vector) {
9090
}
9191

9292
@Override
93-
protected Object getListElement(Object internalStore, int index) {
93+
protected Object getListElementImpl(AccessIterator accessIter, int index) {
9494
try {
95-
return foreign2r.execute(ForeignAccess.sendRead(read, (TruffleObject) internalStore, index));
95+
return foreign2r.execute(ForeignAccess.sendRead(read, (TruffleObject) accessIter.getStore(), index));
9696
} catch (UnsupportedMessageException | UnknownIdentifierException e) {
9797
throw RInternalError.shouldNotReachHere(e);
9898
}
@@ -124,8 +124,8 @@ protected int getLength(RAbstractContainer vector) {
124124
}
125125

126126
@Override
127-
protected Object getListElement(Object store, int index) {
128-
RForeignListWrapper vector = (RForeignListWrapper) store;
127+
protected Object getListElementImpl(AccessIterator accessIter, int index) {
128+
RForeignListWrapper vector = (RForeignListWrapper) accessIter.getStore();
129129
try {
130130
return FOREIGN_TO_R.execute(ForeignAccess.sendRead(READ, vector.delegate, index));
131131
} catch (UnsupportedMessageException | UnknownIdentifierException e) {

0 commit comments

Comments
 (0)