diff options
author | Kazu Hirata <kazu@google.com> | 2022-12-03 11:13:39 -0800 |
---|---|---|
committer | Kazu Hirata <kazu@google.com> | 2022-12-03 11:13:39 -0800 |
commit | 8595f2e54d2df80e8d0f9de415324eaae510a84a (patch) | |
tree | 1b64443aa8d50480efc11202b6d58c19a390f810 /clang/lib/Sema/SemaInit.cpp | |
parent | fee041f69de071cf813c332abc8be279ff7c0bb7 (diff) | |
download | llvm-8595f2e54d2df80e8d0f9de415324eaae510a84a.zip llvm-8595f2e54d2df80e8d0f9de415324eaae510a84a.tar.gz llvm-8595f2e54d2df80e8d0f9de415324eaae510a84a.tar.bz2 |
[Sema] Use std::nullopt instead of None (NFC)
This patch mechanically replaces None with std::nullopt where the
compiler would warn if None were deprecated. The intent is to reduce
the amount of manual work required in migrating from Optional to
std::optional.
This is part of an effort to migrate from llvm::Optional to
std::optional:
https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
-rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 68f5f30..a92c24d 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -503,7 +503,7 @@ ExprResult InitListChecker::PerformEmptyInit(SourceLocation Loc, true); MultiExprArg SubInit; Expr *InitExpr; - InitListExpr DummyInitList(SemaRef.Context, Loc, None, Loc); + InitListExpr DummyInitList(SemaRef.Context, Loc, std::nullopt, Loc); // C++ [dcl.init.aggr]p7: // If there are fewer initializer-clauses in the list than there are @@ -522,8 +522,10 @@ ExprResult InitListChecker::PerformEmptyInit(SourceLocation Loc, // // Only do this if we're initializing a class type, to avoid filling in // the initializer list where possible. - InitExpr = VerifyOnly ? &DummyInitList : new (SemaRef.Context) - InitListExpr(SemaRef.Context, Loc, None, Loc); + InitExpr = VerifyOnly + ? &DummyInitList + : new (SemaRef.Context) + InitListExpr(SemaRef.Context, Loc, std::nullopt, Loc); InitExpr->setType(SemaRef.Context.VoidTy); SubInit = InitExpr; Kind = InitializationKind::CreateCopy(Loc, Loc); @@ -3120,10 +3122,8 @@ InitListExpr * InitListChecker::createInitListExpr(QualType CurrentObjectType, SourceRange InitRange, unsigned ExpectedNumInits) { - InitListExpr *Result - = new (SemaRef.Context) InitListExpr(SemaRef.Context, - InitRange.getBegin(), None, - InitRange.getEnd()); + InitListExpr *Result = new (SemaRef.Context) InitListExpr( + SemaRef.Context, InitRange.getBegin(), std::nullopt, InitRange.getEnd()); QualType ResultType = CurrentObjectType; if (!ResultType->isArrayType()) @@ -5237,7 +5237,7 @@ static void TryDefaultInitialization(Sema &S, // constructor for T is called (and the initialization is ill-formed if // T has no accessible default constructor); if (DestType->isRecordType() && S.getLangOpts().CPlusPlus) { - TryConstructorInitialization(S, Entity, Kind, None, DestType, + TryConstructorInitialization(S, Entity, Kind, std::nullopt, DestType, Entity.getType(), Sequence); return; } |