Skip to content

Commit 57d57d6

Browse files
Apply review comments:
Renamed a variable Simplified MemberExprBasesIdx calculation removing +1/-1 Changed type of Index to uint64_t Signed-off-by: Elizabeth Andrews <[email protected]>
1 parent e7f0187 commit 57d57d6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

clang/lib/Sema/SemaSYCL.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ class SyclKernelFieldHandlerBase {
10821082
virtual bool enterField(const CXXRecordDecl *, FieldDecl *) { return true; }
10831083
virtual bool leaveField(const CXXRecordDecl *, FieldDecl *) { return true; }
10841084
virtual bool enterArray() { return true; }
1085-
virtual bool nextElement(QualType, int64_t) { return true; }
1085+
virtual bool nextElement(QualType, uint64_t) { return true; }
10861086
virtual bool leaveArray(FieldDecl *, QualType, int64_t) { return true; }
10871087

10881088
virtual ~SyclKernelFieldHandlerBase() = default;
@@ -1814,8 +1814,8 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
18141814
// MemberExprBasesIdx is used to get the index of each dimension, in correct
18151815
// order, from MemberExprBases. For example for a[0][0][1], getArrayIndex
18161816
// will return 0, 0 and then 1.
1817-
int MemberExprBasesIdx = (MemberExprBases.size() - 1) - (Dims - 1);
1818-
for (int i = 0; i < Dims; ++i) {
1817+
int MemberExprBasesIdx = MemberExprBases.size() - Dims;
1818+
for (int I = 0; I < Dims; ++I) {
18191819
InitializedEntity NewEntity = InitializedEntity::InitializeElement(
18201820
SemaRef.getASTContext(), getArrayIndex(MemberExprBasesIdx),
18211821
InitEntities.back());
@@ -1851,7 +1851,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
18511851
// ArraySubscriptExprs and the top of stack shows how far we have descended
18521852
// down the array. getDims() calculates this depth.
18531853
QualType ILEType = FD->getType();
1854-
for (int i = getDims(); i > 1; i--) {
1854+
for (int I = getDims(); I > 1; I--) {
18551855
const ConstantArrayType *CAT =
18561856
SemaRef.getASTContext().getAsConstantArrayType(ILEType);
18571857
assert(CAT && "Should only be called on constant-size array.");
@@ -2119,7 +2119,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
21192119
return true;
21202120
}
21212121

2122-
bool nextElement(QualType ET, int64_t) final {
2122+
bool nextElement(QualType ET, uint64_t) final {
21232123
// Top of MemberExprBases holds ArraySubscriptExpression of element
21242124
// we just handled, or the Array base for the dimension we are
21252125
// currently visiting.
@@ -2304,7 +2304,7 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
23042304
return true;
23052305
}
23062306

2307-
bool nextElement(QualType ET, int64_t Index) final {
2307+
bool nextElement(QualType ET, uint64_t Index) final {
23082308
int64_t Size = SemaRef.getASTContext().getTypeSizeInChars(ET).getQuantity();
23092309
CurOffset = ArrayBaseOffsets.back() + Size * (Index);
23102310
return true;

0 commit comments

Comments
 (0)