@@ -896,26 +896,26 @@ class KernelObjVisitor {
896
896
}
897
897
898
898
template <typename ... Handlers>
899
- void VisitArrayElementImpl (const CXXRecordDecl *Owner, FieldDecl *ArrayField,
899
+ void visitArrayElementImpl (const CXXRecordDecl *Owner, FieldDecl *ArrayField,
900
900
QualType ElementTy, uint64_t Index,
901
901
Handlers &... handlers) {
902
902
(void )std::initializer_list<int >{
903
903
(handlers.nextElement (ElementTy, Index), 0 )...};
904
- VisitField (Owner, ArrayField, ElementTy, handlers...);
904
+ visitField (Owner, ArrayField, ElementTy, handlers...);
905
905
}
906
906
907
907
template <typename ... Handlers>
908
- void VisitFirstArrayElement (const CXXRecordDecl *Owner, FieldDecl *ArrayField,
908
+ void visitFirstArrayElement (const CXXRecordDecl *Owner, FieldDecl *ArrayField,
909
909
QualType ElementTy, Handlers &... handlers) {
910
- VisitArrayElementImpl (Owner, ArrayField, ElementTy, 0 , handlers...);
910
+ visitArrayElementImpl (Owner, ArrayField, ElementTy, 0 , handlers...);
911
911
}
912
912
template <typename ... Handlers>
913
- void VisitNthArrayElement (const CXXRecordDecl *Owner, FieldDecl *ArrayField,
913
+ void visitNthArrayElement (const CXXRecordDecl *Owner, FieldDecl *ArrayField,
914
914
QualType ElementTy, uint64_t Index,
915
915
Handlers &... handlers);
916
916
917
917
template <typename ... Handlers>
918
- void VisitArray (const CXXRecordDecl *Owner, FieldDecl *Field,
918
+ void visitArray (const CXXRecordDecl *Owner, FieldDecl *Field,
919
919
QualType ArrayTy, Handlers &... handlers) {
920
920
// Array workflow is:
921
921
// handleArrayType
@@ -939,16 +939,16 @@ class KernelObjVisitor {
939
939
(void )std::initializer_list<int >{
940
940
(handlers.enterArray (Field, ArrayTy, ET), 0 )...};
941
941
942
- VisitFirstArrayElement (Owner, Field, ET, handlers...);
942
+ visitFirstArrayElement (Owner, Field, ET, handlers...);
943
943
for (uint64_t Index = 1 ; Index < ElemCount; ++Index)
944
- VisitNthArrayElement (Owner, Field, ET, Index, handlers...);
944
+ visitNthArrayElement (Owner, Field, ET, Index, handlers...);
945
945
946
946
(void )std::initializer_list<int >{
947
947
(handlers.leaveArray (Field, ArrayTy, ET), 0 )...};
948
948
}
949
949
950
950
template <typename ... Handlers>
951
- void VisitField (const CXXRecordDecl *Owner, FieldDecl *Field,
951
+ void visitField (const CXXRecordDecl *Owner, FieldDecl *Field,
952
952
QualType FieldTy, Handlers &... handlers) {
953
953
if (Util::isSyclAccessorType (FieldTy))
954
954
KF_FOR_EACH (handleSyclAccessorType, Field, FieldTy);
@@ -978,7 +978,7 @@ class KernelObjVisitor {
978
978
else if (FieldTy->isPointerType ())
979
979
KF_FOR_EACH (handlePointerType, Field, FieldTy);
980
980
else if (FieldTy->isArrayType ())
981
- VisitArray (Owner, Field, FieldTy, handlers...);
981
+ visitArray (Owner, Field, FieldTy, handlers...);
982
982
else if (FieldTy->isScalarType () || FieldTy->isVectorType ())
983
983
KF_FOR_EACH (handleScalarType, Field, FieldTy);
984
984
else
@@ -999,7 +999,7 @@ class KernelObjVisitor {
999
999
template <typename ... Handlers>
1000
1000
void VisitRecordFields (const CXXRecordDecl *Owner, Handlers &... handlers) {
1001
1001
for (const auto Field : Owner->fields ())
1002
- VisitField (Owner, Field, Field->getType (), handlers...);
1002
+ visitField (Owner, Field, Field->getType (), handlers...);
1003
1003
}
1004
1004
#undef KF_FOR_EACH
1005
1005
};
@@ -1131,15 +1131,15 @@ void KernelObjVisitor::VisitUnion(const CXXRecordDecl *Owner, ParentTy &Parent,
1131
1131
}
1132
1132
1133
1133
template <typename ... Handlers>
1134
- void KernelObjVisitor::VisitNthArrayElement (const CXXRecordDecl *Owner,
1134
+ void KernelObjVisitor::visitNthArrayElement (const CXXRecordDecl *Owner,
1135
1135
FieldDecl *ArrayField,
1136
1136
QualType ElementTy, uint64_t Index,
1137
1137
Handlers &... handlers) {
1138
1138
// Don't continue descending if none of the handlers 'care'. This could be 'if
1139
1139
// constexpr' starting in C++17. Until then, we have to count on the
1140
1140
// optimizer to realize "if (false)" is a dead branch.
1141
1141
if (AnyTrue<Handlers::VisitNthArrayElement...>::Value)
1142
- VisitArrayElementImpl (
1142
+ visitArrayElementImpl (
1143
1143
Owner, ArrayField, ElementTy, Index,
1144
1144
HandlerFilter<Handlers::VisitNthArrayElement, Handlers>(handlers)
1145
1145
.Handler ...);
@@ -1778,15 +1778,15 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
1778
1778
// is an element of an array. This will determine whether we do
1779
1779
// MemberExprBases in some cases or not, AND determines how we initialize
1780
1780
// values.
1781
- bool IsArrayElement (const FieldDecl *FD, QualType Ty) const {
1781
+ bool isArrayElement (const FieldDecl *FD, QualType Ty) const {
1782
1782
return !SemaRef.getASTContext ().hasSameType (FD->getType (), Ty);
1783
1783
}
1784
1784
1785
1785
// Creates an initialized entity for a field/item. In the case where this is a
1786
1786
// field, returns a normal member initializer, if we're in a sub-array of a MD
1787
1787
// array, returns an element initializer.
1788
1788
InitializedEntity getFieldEntity (FieldDecl *FD, QualType Ty) {
1789
- if (IsArrayElement (FD, Ty))
1789
+ if (isArrayElement (FD, Ty))
1790
1790
return InitializedEntity::InitializeElement (SemaRef.getASTContext (),
1791
1791
ArrayInfos.back ().second ,
1792
1792
ArrayInfos.back ().first );
@@ -1840,13 +1840,13 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
1840
1840
return Result;
1841
1841
}
1842
1842
1843
- void AddFieldMemberExpr (FieldDecl *FD, QualType Ty) {
1844
- if (!IsArrayElement (FD, Ty))
1843
+ void addFieldMemberExpr (FieldDecl *FD, QualType Ty) {
1844
+ if (!isArrayElement (FD, Ty))
1845
1845
MemberExprBases.push_back (BuildMemberExpr (MemberExprBases.back (), FD));
1846
1846
}
1847
1847
1848
- void RemoveFieldMemberExpr (const FieldDecl *FD, QualType Ty) {
1849
- if (!IsArrayElement (FD, Ty))
1848
+ void removeFieldMemberExpr (const FieldDecl *FD, QualType Ty) {
1849
+ if (!isArrayElement (FD, Ty))
1850
1850
MemberExprBases.pop_back ();
1851
1851
}
1852
1852
@@ -1891,14 +1891,14 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
1891
1891
addCollectionInitListExpr (QualType (RD->getTypeForDecl (), 0 ), NumInitExprs);
1892
1892
}
1893
1893
1894
- InitListExpr *CreateInitListExpr (const CXXRecordDecl *RD) {
1894
+ InitListExpr *createInitListExpr (const CXXRecordDecl *RD) {
1895
1895
const ASTRecordLayout &Info =
1896
1896
SemaRef.getASTContext ().getASTRecordLayout (RD);
1897
1897
uint64_t NumInitExprs = Info.getFieldCount () + RD->getNumBases ();
1898
- return CreateInitListExpr (QualType (RD->getTypeForDecl (), 0 ), NumInitExprs);
1898
+ return createInitListExpr (QualType (RD->getTypeForDecl (), 0 ), NumInitExprs);
1899
1899
}
1900
1900
1901
- InitListExpr *CreateInitListExpr (QualType InitTy, uint64_t NumChildInits) {
1901
+ InitListExpr *createInitListExpr (QualType InitTy, uint64_t NumChildInits) {
1902
1902
InitListExpr *ILE = new (SemaRef.getASTContext ()) InitListExpr (
1903
1903
SemaRef.getASTContext (), SourceLocation (), {}, SourceLocation ());
1904
1904
ILE->reserveInits (SemaRef.getASTContext (), NumChildInits);
@@ -1911,7 +1911,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
1911
1911
// to append into.
1912
1912
void addCollectionInitListExpr (QualType InitTy, uint64_t NumChildInits) {
1913
1913
1914
- InitListExpr *ILE = CreateInitListExpr (InitTy, NumChildInits);
1914
+ InitListExpr *ILE = createInitListExpr (InitTy, NumChildInits);
1915
1915
InitListExpr *ParentILE = CollectionInitExprs.back ();
1916
1916
ParentILE->updateInit (SemaRef.getASTContext (), ParentILE->getNumInits (),
1917
1917
ILE);
@@ -1937,12 +1937,12 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
1937
1937
addFieldInit (FD, Ty, None,
1938
1938
InitializationKind::CreateDefault (SourceLocation ()));
1939
1939
1940
- AddFieldMemberExpr (FD, Ty);
1940
+ addFieldMemberExpr (FD, Ty);
1941
1941
1942
1942
const auto *RecordDecl = Ty->getAsCXXRecordDecl ();
1943
1943
createSpecialMethodCall (RecordDecl, InitMethodName, BodyStmts);
1944
1944
1945
- RemoveFieldMemberExpr (FD, Ty);
1945
+ removeFieldMemberExpr (FD, Ty);
1946
1946
1947
1947
return true ;
1948
1948
}
@@ -1963,7 +1963,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
1963
1963
DC.getKernelDecl(), KernelObj)),
1964
1964
VarEntity(InitializedEntity::InitializeVariable(KernelObjClone)),
1965
1965
KernelObj(KernelObj), KernelCallerFunc(KernelCallerFunc) {
1966
- CollectionInitExprs.push_back (CreateInitListExpr (KernelObj));
1966
+ CollectionInitExprs.push_back (createInitListExpr (KernelObj));
1967
1967
markParallelWorkItemCalls ();
1968
1968
1969
1969
Stmt *DS = new (S.Context ) DeclStmt (DeclGroupRef (KernelObjClone),
@@ -2037,9 +2037,9 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
2037
2037
++ContainerDepth;
2038
2038
// Add a dummy init expression to catch the accessor initializers.
2039
2039
const auto *StreamDecl = Ty->getAsCXXRecordDecl ();
2040
- CollectionInitExprs.push_back (CreateInitListExpr (StreamDecl));
2040
+ CollectionInitExprs.push_back (createInitListExpr (StreamDecl));
2041
2041
2042
- AddFieldMemberExpr (FD, Ty);
2042
+ addFieldMemberExpr (FD, Ty);
2043
2043
return true ;
2044
2044
}
2045
2045
@@ -2052,7 +2052,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
2052
2052
createSpecialMethodCall (StreamDecl, InitMethodName, BodyStmts);
2053
2053
createSpecialMethodCall (StreamDecl, FinalizeMethodName, FinalizeStmts);
2054
2054
2055
- RemoveFieldMemberExpr (FD, Ty);
2055
+ removeFieldMemberExpr (FD, Ty);
2056
2056
2057
2057
CollectionInitExprs.pop_back ();
2058
2058
return true ;
@@ -2062,15 +2062,15 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
2062
2062
++ContainerDepth;
2063
2063
addCollectionInitListExpr (Ty->getAsCXXRecordDecl ());
2064
2064
2065
- AddFieldMemberExpr (FD, Ty);
2065
+ addFieldMemberExpr (FD, Ty);
2066
2066
return true ;
2067
2067
}
2068
2068
2069
2069
bool leaveStruct (const CXXRecordDecl *, FieldDecl *FD, QualType Ty) final {
2070
2070
--ContainerDepth;
2071
2071
CollectionInitExprs.pop_back ();
2072
2072
2073
- RemoveFieldMemberExpr (FD, Ty);
2073
+ removeFieldMemberExpr (FD, Ty);
2074
2074
return true ;
2075
2075
}
2076
2076
@@ -2112,7 +2112,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
2112
2112
2113
2113
// If this is the top-level array, we need to make a MemberExpr in addition
2114
2114
// to an array subscript.
2115
- AddFieldMemberExpr (FD, ArrayType);
2115
+ addFieldMemberExpr (FD, ArrayType);
2116
2116
return true ;
2117
2117
}
2118
2118
@@ -2154,7 +2154,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
2154
2154
MemberExprBases.pop_back ();
2155
2155
2156
2156
// Remove the field access expr as well.
2157
- RemoveFieldMemberExpr (FD, ArrayType);
2157
+ removeFieldMemberExpr (FD, ArrayType);
2158
2158
return true ;
2159
2159
}
2160
2160
@@ -2170,7 +2170,7 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
2170
2170
2171
2171
// A series of functions to calculate the change in offset based on the type.
2172
2172
int64_t offsetOf (const FieldDecl *FD, QualType ArgTy) const {
2173
- return IsArrayElement (FD, ArgTy)
2173
+ return isArrayElement (FD, ArgTy)
2174
2174
? 0
2175
2175
: SemaRef.getASTContext ().getFieldOffset (FD) / 8 ;
2176
2176
}
@@ -2198,7 +2198,7 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
2198
2198
// is an element of an array. This will determine whether we do
2199
2199
// MemberExprBases in some cases or not, AND determines how we initialize
2200
2200
// values.
2201
- bool IsArrayElement (const FieldDecl *FD, QualType Ty) const {
2201
+ bool isArrayElement (const FieldDecl *FD, QualType Ty) const {
2202
2202
return !SemaRef.getASTContext ().hasSameType (FD->getType (), Ty);
2203
2203
}
2204
2204
0 commit comments