Skip to content

Commit 587cc77

Browse files
author
Erich Keane
committed
More function/veriable name fixes
1 parent 33f92b0 commit 587cc77

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

‎clang/lib/Sema/SemaSYCL.cpp

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -791,17 +791,17 @@ template <typename T> using bind_param_t = typename bind_param<T>::type;
791791
class KernelObjVisitor {
792792
Sema &SemaRef;
793793

794-
template <typename ParentTy, typename... Handlers>
794+
template <typename ParentTy, typename... HandlerTys>
795795
void VisitUnionImpl(const CXXRecordDecl *Owner, ParentTy &Parent,
796-
const CXXRecordDecl *Wrapper, Handlers &... handlers) {
796+
const CXXRecordDecl *Wrapper, HandlerTys &... Handlers) {
797797
(void)std::initializer_list<int>{
798-
(handlers.enterUnion(Owner, Parent), 0)...};
799-
VisitRecordHelper(Wrapper, Wrapper->fields(), handlers...);
798+
(Handlers.enterUnion(Owner, Parent), 0)...};
799+
VisitRecordHelper(Wrapper, Wrapper->fields(), Handlers...);
800800
(void)std::initializer_list<int>{
801-
(handlers.leaveUnion(Owner, Parent), 0)...};
801+
(Handlers.leaveUnion(Owner, Parent), 0)...};
802802
}
803803

804-
// These enable handler execution only when previous handlers succeed.
804+
// These enable handler execution only when previous Handlers succeed.
805805
template <typename... Tn>
806806
bool handleField(FieldDecl *FD, QualType FDTy, Tn &&... tn) {
807807
bool result = true;
@@ -819,104 +819,104 @@ class KernelObjVisitor {
819819
#define KF_FOR_EACH(FUNC, Item, Qt) \
820820
handleField( \
821821
Item, Qt, \
822-
std::bind(static_cast<bool (std::decay_t<decltype(handlers)>::*)( \
822+
std::bind(static_cast<bool (std::decay_t<decltype(Handlers)>::*)( \
823823
bind_param_t<decltype(Item)>, QualType)>( \
824-
&std::decay_t<decltype(handlers)>::FUNC), \
825-
std::ref(handlers), _1, _2)...)
824+
&std::decay_t<decltype(Handlers)>::FUNC), \
825+
std::ref(Handlers), _1, _2)...)
826826

827827
// The following simpler definition works with gcc 8.x and later.
828828
//#define KF_FOR_EACH(FUNC) \
829829
// handleField(Field, FieldTy, ([&](FieldDecl *FD, QualType FDTy) { \
830-
// return handlers.f(FD, FDTy); \
830+
// return Handlers.f(FD, FDTy); \
831831
// })...)
832832

833833
// Parent contains the FieldDecl or CXXBaseSpecifier that was used to enter
834834
// the Wrapper structure that we're currently visiting. Owner is the parent
835835
// type (which doesn't exist in cases where it is a FieldDecl in the
836836
// 'root'), and Wrapper is the current struct being unwrapped.
837-
template <typename ParentTy, typename... Handlers>
838-
void VisitRecord(const CXXRecordDecl *Owner, ParentTy &Parent,
837+
template <typename ParentTy, typename... HandlerTys>
838+
void visitRecord(const CXXRecordDecl *Owner, ParentTy &Parent,
839839
const CXXRecordDecl *Wrapper, QualType RecordTy,
840-
Handlers &... handlers) {
840+
HandlerTys &... Handlers) {
841841
(void)std::initializer_list<int>{
842-
(handlers.enterStruct(Owner, Parent, RecordTy), 0)...};
843-
VisitRecordHelper(Wrapper, Wrapper->bases(), handlers...);
844-
VisitRecordHelper(Wrapper, Wrapper->fields(), handlers...);
842+
(Handlers.enterStruct(Owner, Parent, RecordTy), 0)...};
843+
VisitRecordHelper(Wrapper, Wrapper->bases(), Handlers...);
844+
VisitRecordHelper(Wrapper, Wrapper->fields(), Handlers...);
845845
(void)std::initializer_list<int>{
846-
(handlers.leaveStruct(Owner, Parent, RecordTy), 0)...};
846+
(Handlers.leaveStruct(Owner, Parent, RecordTy), 0)...};
847847
}
848848

849-
template <typename ParentTy, typename... Handlers>
849+
template <typename ParentTy, typename... HandlerTys>
850850
void VisitUnion(const CXXRecordDecl *Owner, ParentTy &Parent,
851-
const CXXRecordDecl *Wrapper, Handlers &... handlers);
851+
const CXXRecordDecl *Wrapper, HandlerTys &... Handlers);
852852

853-
template <typename... Handlers>
853+
template <typename... HandlerTys>
854854
void VisitRecordHelper(const CXXRecordDecl *Owner,
855855
clang::CXXRecordDecl::base_class_const_range Range,
856-
Handlers &... handlers) {
856+
HandlerTys &... Handlers) {
857857
for (const auto &Base : Range) {
858858
QualType BaseTy = Base.getType();
859859
// Handle accessor class as base
860860
if (Util::isSyclAccessorType(BaseTy)) {
861861
(void)std::initializer_list<int>{
862-
(handlers.handleSyclAccessorType(Owner, Base, BaseTy), 0)...};
862+
(Handlers.handleSyclAccessorType(Owner, Base, BaseTy), 0)...};
863863
} else if (Util::isSyclStreamType(BaseTy)) {
864864
// Handle stream class as base
865865
(void)std::initializer_list<int>{
866-
(handlers.handleSyclStreamType(Owner, Base, BaseTy), 0)...};
866+
(Handlers.handleSyclStreamType(Owner, Base, BaseTy), 0)...};
867867
} else
868868
// For all other bases, visit the record
869-
VisitRecord(Owner, Base, BaseTy->getAsCXXRecordDecl(), BaseTy,
870-
handlers...);
869+
visitRecord(Owner, Base, BaseTy->getAsCXXRecordDecl(), BaseTy,
870+
Handlers...);
871871
}
872872
}
873873

874-
template <typename... Handlers>
874+
template <typename... HandlerTys>
875875
void VisitRecordHelper(const CXXRecordDecl *Owner,
876876
RecordDecl::field_range Range,
877-
Handlers &... handlers) {
878-
VisitRecordFields(Owner, handlers...);
877+
HandlerTys &... Handlers) {
878+
VisitRecordFields(Owner, Handlers...);
879879
}
880880

881881
// FIXME: Can this be refactored/handled some other way?
882-
template <typename ParentTy, typename... Handlers>
883-
void VisitStreamRecord(const CXXRecordDecl *Owner, ParentTy &Parent,
882+
template <typename ParentTy, typename... HandlerTys>
883+
void visitStreamRecord(const CXXRecordDecl *Owner, ParentTy &Parent,
884884
CXXRecordDecl *Wrapper, QualType RecordTy,
885-
Handlers &... handlers) {
885+
HandlerTys &... Handlers) {
886886
(void)std::initializer_list<int>{
887-
(handlers.enterStream(Owner, Parent, RecordTy), 0)...};
887+
(Handlers.enterStream(Owner, Parent, RecordTy), 0)...};
888888
for (const auto &Field : Wrapper->fields()) {
889889
QualType FieldTy = Field->getType();
890890
// Required to initialize accessors inside streams.
891891
if (Util::isSyclAccessorType(FieldTy))
892892
KF_FOR_EACH(handleSyclAccessorType, Field, FieldTy);
893893
}
894894
(void)std::initializer_list<int>{
895-
(handlers.leaveStream(Owner, Parent, RecordTy), 0)...};
895+
(Handlers.leaveStream(Owner, Parent, RecordTy), 0)...};
896896
}
897897

898-
template <typename... Handlers>
898+
template <typename... HandlerTys>
899899
void visitArrayElementImpl(const CXXRecordDecl *Owner, FieldDecl *ArrayField,
900900
QualType ElementTy, uint64_t Index,
901-
Handlers &... handlers) {
901+
HandlerTys &... Handlers) {
902902
(void)std::initializer_list<int>{
903-
(handlers.nextElement(ElementTy, Index), 0)...};
904-
visitField(Owner, ArrayField, ElementTy, handlers...);
903+
(Handlers.nextElement(ElementTy, Index), 0)...};
904+
visitField(Owner, ArrayField, ElementTy, Handlers...);
905905
}
906906

907-
template <typename... Handlers>
907+
template <typename... HandlerTys>
908908
void visitFirstArrayElement(const CXXRecordDecl *Owner, FieldDecl *ArrayField,
909-
QualType ElementTy, Handlers &... handlers) {
910-
visitArrayElementImpl(Owner, ArrayField, ElementTy, 0, handlers...);
909+
QualType ElementTy, HandlerTys &... Handlers) {
910+
visitArrayElementImpl(Owner, ArrayField, ElementTy, 0, Handlers...);
911911
}
912-
template <typename... Handlers>
912+
template <typename... HandlerTys>
913913
void visitNthArrayElement(const CXXRecordDecl *Owner, FieldDecl *ArrayField,
914914
QualType ElementTy, uint64_t Index,
915-
Handlers &... handlers);
915+
HandlerTys &... Handlers);
916916

917-
template <typename... Handlers>
917+
template <typename... HandlerTys>
918918
void visitArray(const CXXRecordDecl *Owner, FieldDecl *Field,
919-
QualType ArrayTy, Handlers &... handlers) {
919+
QualType ArrayTy, HandlerTys &... Handlers) {
920920
// Array workflow is:
921921
// handleArrayType
922922
// enterArray
@@ -937,19 +937,19 @@ class KernelObjVisitor {
937937
assert(ElemCount > 0 && "SYCL prohibits 0 sized arrays");
938938

939939
(void)std::initializer_list<int>{
940-
(handlers.enterArray(Field, ArrayTy, ET), 0)...};
940+
(Handlers.enterArray(Field, ArrayTy, ET), 0)...};
941941

942-
visitFirstArrayElement(Owner, Field, ET, handlers...);
942+
visitFirstArrayElement(Owner, Field, ET, Handlers...);
943943
for (uint64_t Index = 1; Index < ElemCount; ++Index)
944-
visitNthArrayElement(Owner, Field, ET, Index, handlers...);
944+
visitNthArrayElement(Owner, Field, ET, Index, Handlers...);
945945

946946
(void)std::initializer_list<int>{
947-
(handlers.leaveArray(Field, ArrayTy, ET), 0)...};
947+
(Handlers.leaveArray(Field, ArrayTy, ET), 0)...};
948948
}
949949

950-
template <typename... Handlers>
950+
template <typename... HandlerTys>
951951
void visitField(const CXXRecordDecl *Owner, FieldDecl *Field,
952-
QualType FieldTy, Handlers &... handlers) {
952+
QualType FieldTy, HandlerTys &... Handlers) {
953953
if (Util::isSyclAccessorType(FieldTy))
954954
KF_FOR_EACH(handleSyclAccessorType, Field, FieldTy);
955955
else if (Util::isSyclSamplerType(FieldTy))
@@ -962,23 +962,23 @@ class KernelObjVisitor {
962962
CXXRecordDecl *RD = FieldTy->getAsCXXRecordDecl();
963963
// Handle accessors in stream class.
964964
KF_FOR_EACH(handleSyclStreamType, Field, FieldTy);
965-
VisitStreamRecord(Owner, Field, RD, FieldTy, handlers...);
965+
visitStreamRecord(Owner, Field, RD, FieldTy, Handlers...);
966966
} else if (FieldTy->isStructureOrClassType()) {
967967
if (KF_FOR_EACH(handleStructType, Field, FieldTy)) {
968968
CXXRecordDecl *RD = FieldTy->getAsCXXRecordDecl();
969-
VisitRecord(Owner, Field, RD, FieldTy, handlers...);
969+
visitRecord(Owner, Field, RD, FieldTy, Handlers...);
970970
}
971971
} else if (FieldTy->isUnionType()) {
972972
if (KF_FOR_EACH(handleUnionType, Field, FieldTy)) {
973973
CXXRecordDecl *RD = FieldTy->getAsCXXRecordDecl();
974-
VisitUnion(Owner, Field, RD, handlers...);
974+
VisitUnion(Owner, Field, RD, Handlers...);
975975
}
976976
} else if (FieldTy->isReferenceType())
977977
KF_FOR_EACH(handleReferenceType, Field, FieldTy);
978978
else if (FieldTy->isPointerType())
979979
KF_FOR_EACH(handlePointerType, Field, FieldTy);
980980
else if (FieldTy->isArrayType())
981-
visitArray(Owner, Field, FieldTy, handlers...);
981+
visitArray(Owner, Field, FieldTy, Handlers...);
982982
else if (FieldTy->isScalarType() || FieldTy->isVectorType())
983983
KF_FOR_EACH(handleScalarType, Field, FieldTy);
984984
else
@@ -988,18 +988,18 @@ class KernelObjVisitor {
988988
public:
989989
KernelObjVisitor(Sema &S) : SemaRef(S) {}
990990

991-
template <typename... Handlers>
991+
template <typename... HandlerTys>
992992
void VisitRecordBases(const CXXRecordDecl *KernelFunctor,
993-
Handlers &... handlers) {
994-
VisitRecordHelper(KernelFunctor, KernelFunctor->bases(), handlers...);
993+
HandlerTys &... Handlers) {
994+
VisitRecordHelper(KernelFunctor, KernelFunctor->bases(), Handlers...);
995995
}
996996

997997
// A visitor function that dispatches to functions as defined in
998998
// SyclKernelFieldHandler for the purposes of kernel generation.
999-
template <typename... Handlers>
1000-
void VisitRecordFields(const CXXRecordDecl *Owner, Handlers &... handlers) {
999+
template <typename... HandlerTys>
1000+
void VisitRecordFields(const CXXRecordDecl *Owner, HandlerTys &... Handlers) {
10011001
for (const auto Field : Owner->fields())
1002-
visitField(Owner, Field, Field->getType(), handlers...);
1002+
visitField(Owner, Field, Field->getType(), Handlers...);
10031003
}
10041004
#undef KF_FOR_EACH
10051005
};
@@ -1761,7 +1761,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
17611761
CXXRecordDecl *WrapperStruct = ParamType->getAsCXXRecordDecl();
17621762
// Pointer field wrapped inside __wrapper_class
17631763
FieldDecl *Pointer = *(WrapperStruct->field_begin());
1764-
DRE = BuildMemberExpr(DRE, Pointer);
1764+
DRE = buildMemberExpr(DRE, Pointer);
17651765
ParamType = Pointer->getType();
17661766
}
17671767

@@ -1829,7 +1829,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
18291829
addFieldInit(FD, Ty, ParamRef);
18301830
}
18311831

1832-
MemberExpr *BuildMemberExpr(Expr *Base, ValueDecl *Member) {
1832+
MemberExpr *buildMemberExpr(Expr *Base, ValueDecl *Member) {
18331833
DeclAccessPair MemberDAP = DeclAccessPair::make(Member, AS_none);
18341834
MemberExpr *Result = SemaRef.BuildMemberExpr(
18351835
Base, /*IsArrow */ false, SourceLocation(), NestedNameSpecifierLoc(),
@@ -1842,7 +1842,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
18421842

18431843
void addFieldMemberExpr(FieldDecl *FD, QualType Ty) {
18441844
if (!isArrayElement(FD, Ty))
1845-
MemberExprBases.push_back(BuildMemberExpr(MemberExprBases.back(), FD));
1845+
MemberExprBases.push_back(buildMemberExpr(MemberExprBases.back(), FD));
18461846
}
18471847

18481848
void removeFieldMemberExpr(const FieldDecl *FD, QualType Ty) {
@@ -1866,7 +1866,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
18661866
VK_LValue, SourceLocation());
18671867
}
18681868

1869-
MemberExpr *MethodME = BuildMemberExpr(MemberExprBases.back(), Method);
1869+
MemberExpr *MethodME = buildMemberExpr(MemberExprBases.back(), Method);
18701870

18711871
QualType ResultTy = Method->getReturnType();
18721872
ExprValueKind VK = Expr::getValueKindForType(ResultTy);

0 commit comments

Comments
 (0)