Skip to content

Commit 8139a7b

Browse files
committed
Fix build after 254ef5f
1 parent 37ec185 commit 8139a7b

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

clang/lib/Sema/SemaSYCL.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3780,10 +3780,9 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
37803780
InitializedEntity Entity = InitializedEntity::InitializeBase(
37813781
SemaSYCLRef.getASTContext(), &BS, /*IsInheritedVirtualBase*/ false,
37823782
&VarEntity.value());
3783-
InitializationSequence InitSeq(SemaSYCLRef.SemaRef, Entity, InitKind,
3784-
std::nullopt);
3783+
InitializationSequence InitSeq(SemaSYCLRef.SemaRef, Entity, InitKind, {});
37853784
ExprResult Init =
3786-
InitSeq.Perform(SemaSYCLRef.SemaRef, Entity, InitKind, std::nullopt);
3785+
InitSeq.Perform(SemaSYCLRef.SemaRef, Entity, InitKind, {});
37873786

37883787
InitListExpr *ParentILE = CollectionInitExprs.back();
37893788
ParentILE->updateInit(SemaSYCLRef.getASTContext(), ParentILE->getNumInits(),
@@ -4005,7 +4004,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
40054004
DefaultConstructorAccess = DefaultConstructor->getAccess();
40064005
DefaultConstructor->setAccess(AS_public);
40074006

4008-
addFieldInit(FD, Ty, std::nullopt,
4007+
addFieldInit(FD, Ty, {},
40094008
InitializationKind::CreateDefault(KernelCallerSrcLoc));
40104009
DefaultConstructor->setAccess(DefaultConstructorAccess);
40114010
addFieldMemberExpr(FD, Ty);
@@ -4064,9 +4063,9 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
40644063
InitializationKind InitKind =
40654064
InitializationKind::CreateDefault(KernelCallerSrcLoc);
40664065
InitializationSequence InitSeq(SemaSYCLRef.SemaRef, VarEntity, InitKind,
4067-
std::nullopt);
4066+
{});
40684067
ExprResult Init =
4069-
InitSeq.Perform(SemaSYCLRef.SemaRef, VarEntity, InitKind, std::nullopt);
4068+
InitSeq.Perform(SemaSYCLRef.SemaRef, VarEntity, InitKind, {});
40704069
KernelHandlerClone->setInit(
40714070
SemaSYCLRef.SemaRef.MaybeCreateExprWithCleanups(Init.get()));
40724071
KernelHandlerClone->setInitStyle(VarDecl::CallInit);
@@ -4571,9 +4570,9 @@ class FreeFunctionKernelBodyCreator : public SyclKernelFieldHandler {
45714570
InitializationKind InitKind =
45724571
InitializationKind::CreateDefault(FreeFunctionSrcLoc);
45734572
InitializationSequence InitSeq(SemaSYCLRef.SemaRef, VarEntity, InitKind,
4574-
std::nullopt);
4573+
{});
45754574
ExprResult Init =
4576-
InitSeq.Perform(SemaSYCLRef.SemaRef, VarEntity, InitKind, std::nullopt);
4575+
InitSeq.Perform(SemaSYCLRef.SemaRef, VarEntity, InitKind, {});
45774576
SpecialObjectClone->setInit(
45784577
SemaSYCLRef.SemaRef.MaybeCreateExprWithCleanups(Init.get()));
45794578
SpecialObjectClone->setInitStyle(VarDecl::CallInit);

0 commit comments

Comments
 (0)