Skip to content

Commit 6a30894

Browse files
AaronBallmanAaronBallman
committed
C++2a -> C++20 in some identifiers; NFC.
1 parent 1e1f5eb commit 6a30894

40 files changed

+137
-137
lines changed

‎clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ void ProTypeMemberInitCheck::checkMissingMemberInitializer(
456456
// Don't suggest fixes for bitfields because in-class initialization is not
457457
// possible until C++2a.
458458
if (F->getType()->isEnumeralType() ||
459-
(!getLangOpts().CPlusPlus2a && F->isBitField()))
459+
(!getLangOpts().CPlusPlus20 && F->isBitField()))
460460
return;
461461
if (!F->getParent()->isUnion() || UnionsSeen.insert(F->getParent()).second)
462462
FieldsToFix.insert(F);

‎clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void UseDefaultMemberInitCheck::registerMatchers(MatchFinder *Finder) {
217217
isDefaultConstructor(), unless(isInstantiated()),
218218
forEachConstructorInitializer(
219219
cxxCtorInitializer(
220-
forField(unless(anyOf(getLangOpts().CPlusPlus2a
220+
forField(unless(anyOf(getLangOpts().CPlusPlus20
221221
? unless(anything())
222222
: isBitField(),
223223
hasInClassInitializer(anything()),

‎clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void SIMDIntrinsicsCheck::registerMatchers(MatchFinder *Finder) {
9696
// If Std is not specified, infer it from the language options.
9797
// libcxx implementation backports it to C++11 std::experimental::simd.
9898
if (Std.empty())
99-
Std = getLangOpts().CPlusPlus2a ? "std" : "std::experimental";
99+
Std = getLangOpts().CPlusPlus20 ? "std" : "std::experimental";
100100

101101
Finder->addMatcher(callExpr(callee(functionDecl(
102102
matchesName("^::(_mm_|_mm256_|_mm512_|vec_)"),

‎clang/include/clang/AST/DeclCXX.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ class CXXRecordDecl : public RecordDecl {
11671167
bool defaultedDefaultConstructorIsConstexpr() const {
11681168
return data().DefaultedDefaultConstructorIsConstexpr &&
11691169
(!isUnion() || hasInClassInitializer() || !hasVariantMembers() ||
1170-
getLangOpts().CPlusPlus2a);
1170+
getLangOpts().CPlusPlus20);
11711171
}
11721172

11731173
/// Determine whether this class has a constexpr default constructor.
@@ -1259,7 +1259,7 @@ class CXXRecordDecl : public RecordDecl {
12591259
/// would be constexpr.
12601260
bool defaultedDestructorIsConstexpr() const {
12611261
return data().DefaultedDestructorIsConstexpr &&
1262-
getLangOpts().CPlusPlus2a;
1262+
getLangOpts().CPlusPlus20;
12631263
}
12641264

12651265
/// Determine whether this class has a constexpr destructor.
@@ -1357,7 +1357,7 @@ class CXXRecordDecl : public RecordDecl {
13571357
/// Only in C++17 and beyond, are lambdas literal types.
13581358
bool isLiteral() const {
13591359
const LangOptions &LangOpts = getLangOpts();
1360-
return (LangOpts.CPlusPlus2a ? hasConstexprDestructor()
1360+
return (LangOpts.CPlusPlus20 ? hasConstexprDestructor()
13611361
: hasTrivialDestructor()) &&
13621362
(!isLambda() || LangOpts.CPlusPlus17) &&
13631363
!hasNonLiteralTypeFieldsOrBases() &&

‎clang/include/clang/Basic/LangOptions.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ LANGOPT(CPlusPlus , 1, 0, "C++")
9191
LANGOPT(CPlusPlus11 , 1, 0, "C++11")
9292
LANGOPT(CPlusPlus14 , 1, 0, "C++14")
9393
LANGOPT(CPlusPlus17 , 1, 0, "C++17")
94-
LANGOPT(CPlusPlus2a , 1, 0, "C++2a")
94+
LANGOPT(CPlusPlus20 , 1, 0, "C++20")
9595
LANGOPT(ObjC , 1, 0, "Objective-C")
9696
BENIGN_LANGOPT(ObjCDefaultSynthProperties , 1, 0,
9797
"Objective-C auto-synthesized properties")
@@ -243,7 +243,7 @@ LANGOPT(SizedDeallocation , 1, 0, "sized deallocation")
243243
LANGOPT(AlignedAllocation , 1, 0, "aligned allocation")
244244
LANGOPT(AlignedAllocationUnavailable, 1, 0, "aligned allocation functions are unavailable")
245245
LANGOPT(NewAlignOverride , 32, 0, "maximum alignment guaranteed by '::operator new(size_t)'")
246-
LANGOPT(ConceptSatisfactionCaching , 1, 1, "enable satisfaction caching for C++2a Concepts")
246+
LANGOPT(ConceptSatisfactionCaching , 1, 1, "enable satisfaction caching for C++20 Concepts")
247247
BENIGN_LANGOPT(ModulesCodegen , 1, 0, "Modules code generation")
248248
BENIGN_LANGOPT(ModulesDebugInfo , 1, 0, "Modules debug info")
249249
BENIGN_LANGOPT(ElideConstructors , 1, 1, "C++ copy constructor elision")

‎clang/include/clang/Basic/LangStandard.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ enum LangFeatures {
4848
CPlusPlus11 = (1 << 6),
4949
CPlusPlus14 = (1 << 7),
5050
CPlusPlus17 = (1 << 8),
51-
CPlusPlus2a = (1 << 9),
51+
CPlusPlus20 = (1 << 9),
5252
Digraphs = (1 << 10),
5353
GNUMode = (1 << 11),
5454
HexFloat = (1 << 12),
@@ -108,8 +108,8 @@ struct LangStandard {
108108
/// isCPlusPlus17 - Language is a C++17 variant (or later).
109109
bool isCPlusPlus17() const { return Flags & CPlusPlus17; }
110110

111-
/// isCPlusPlus2a - Language is a post-C++17 variant (or later).
112-
bool isCPlusPlus2a() const { return Flags & CPlusPlus2a; }
111+
/// isCPlusPlus20 - Language is a C++20 variant (or later).
112+
bool isCPlusPlus20() const { return Flags & CPlusPlus20; }
113113

114114
/// hasDigraphs - Language supports digraphs.
115115
bool hasDigraphs() const { return Flags & Digraphs; }

‎clang/include/clang/Basic/LangStandards.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ LANGSTANDARD_ALIAS_DEPR(gnucxx17, "gnu++1z")
143143
LANGSTANDARD(cxx20, "c++20",
144144
CXX, "ISO C++ 2020 DIS",
145145
LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | CPlusPlus17 |
146-
CPlusPlus2a | Digraphs | HexFloat)
146+
CPlusPlus20 | Digraphs | HexFloat)
147147
LANGSTANDARD_ALIAS_DEPR(cxx20, "c++2a")
148148

149149
LANGSTANDARD(gnucxx20, "gnu++20",
150150
CXX, "ISO C++ 2020 DIS with GNU extensions",
151151
LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | CPlusPlus17 |
152-
CPlusPlus2a | Digraphs | HexFloat | GNUMode)
152+
CPlusPlus20 | Digraphs | HexFloat | GNUMode)
153153
LANGSTANDARD_ALIAS_DEPR(gnucxx20, "gnu++2a")
154154

155155
// OpenCL

‎clang/include/clang/Basic/TokenKinds.def

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
#ifndef CXX11_KEYWORD
2727
#define CXX11_KEYWORD(X,Y) KEYWORD(X,KEYCXX11|(Y))
2828
#endif
29-
#ifndef CXX2A_KEYWORD
30-
#define CXX2A_KEYWORD(X,Y) KEYWORD(X,KEYCXX2A|(Y))
29+
#ifndef CXX20_KEYWORD
30+
#define CXX20_KEYWORD(X,Y) KEYWORD(X,KEYCXX20|(Y))
3131
#endif
3232
#ifndef CONCEPTS_KEYWORD
33-
#define CONCEPTS_KEYWORD(X) CXX2A_KEYWORD(X,KEYCONCEPTS)
33+
#define CONCEPTS_KEYWORD(X) CXX20_KEYWORD(X,KEYCONCEPTS)
3434
#endif
3535
#ifndef COROUTINES_KEYWORD
36-
#define COROUTINES_KEYWORD(X) CXX2A_KEYWORD(X,KEYCOROUTINES)
36+
#define COROUTINES_KEYWORD(X) CXX20_KEYWORD(X,KEYCOROUTINES)
3737
#endif
3838
#ifndef MODULES_KEYWORD
3939
#define MODULES_KEYWORD(X) KEYWORD(X,KEYMODULES)
@@ -244,7 +244,7 @@ PUNCTUATOR(caretcaret, "^^")
244244
// implementation namespace
245245
// KEYNOCXX - This is a keyword in every non-C++ dialect.
246246
// KEYCXX11 - This is a C++ keyword introduced to C++ in C++11
247-
// KEYCXX2A - This is a C++ keyword introduced to C++ in C++2a
247+
// KEYCXX20 - This is a C++ keyword introduced to C++ in C++20
248248
// KEYCONCEPTS - This is a keyword if the C++ extensions for concepts
249249
// are enabled.
250250
// KEYMODULES - This is a keyword if the C++ extensions for modules
@@ -374,11 +374,11 @@ CXX11_KEYWORD(nullptr , 0)
374374
CXX11_KEYWORD(static_assert , KEYMSCOMPAT)
375375
CXX11_KEYWORD(thread_local , 0)
376376

377-
// C++2a keywords
377+
// C++20 keywords
378378
CONCEPTS_KEYWORD(concept)
379379
CONCEPTS_KEYWORD(requires)
380380

381-
// C++2a / coroutines TS keywords
381+
// C++20 / coroutines TS keywords
382382
COROUTINES_KEYWORD(co_await)
383383
COROUTINES_KEYWORD(co_return)
384384
COROUTINES_KEYWORD(co_yield)
@@ -388,9 +388,9 @@ MODULES_KEYWORD(module)
388388
MODULES_KEYWORD(import)
389389

390390
// C++20 keywords.
391-
CXX2A_KEYWORD(char8_t , CHAR8SUPPORT)
392-
CXX2A_KEYWORD(consteval , 0)
393-
CXX2A_KEYWORD(constinit , 0)
391+
CXX20_KEYWORD(char8_t , CHAR8SUPPORT)
392+
CXX20_KEYWORD(consteval , 0)
393+
CXX20_KEYWORD(constinit , 0)
394394

395395
// C11 Extension
396396
KEYWORD(_Float16 , KEYALL)
@@ -865,7 +865,7 @@ ANNOTATION(header_unit)
865865
#undef TYPE_TRAIT_1
866866
#undef TYPE_TRAIT
867867
#undef CONCEPTS_KEYWORD
868-
#undef CXX2A_KEYWORD
868+
#undef CXX20_KEYWORD
869869
#undef CXX11_KEYWORD
870870
#undef KEYWORD
871871
#undef PUNCTUATOR

‎clang/lib/AST/DeclCXX.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ bool CXXRecordDecl::lambdaIsDefaultConstructibleAndAssignable() const {
667667
if (getLambdaCaptureDefault() != LCD_None ||
668668
getLambdaData().NumCaptures != 0)
669669
return false;
670-
return getASTContext().getLangOpts().CPlusPlus2a;
670+
return getASTContext().getLangOpts().CPlusPlus20;
671671
}
672672

673673
void CXXRecordDecl::addedMember(Decl *D) {
@@ -783,7 +783,7 @@ void CXXRecordDecl::addedMember(Decl *D) {
783783
// C++20 [dcl.init.aggr]p1:
784784
// An aggregate is an array or a class with no user-declared [...]
785785
// constructors
786-
if (getASTContext().getLangOpts().CPlusPlus2a
786+
if (getASTContext().getLangOpts().CPlusPlus20
787787
? !Constructor->isImplicit()
788788
: (Constructor->isUserProvided() || Constructor->isExplicit()))
789789
data().Aggregate = false;
@@ -1289,7 +1289,7 @@ void CXXRecordDecl::addedMember(Decl *D) {
12891289
// Base element type of field is a non-class type.
12901290
if (!T->isLiteralType(Context) ||
12911291
(!Field->hasInClassInitializer() && !isUnion() &&
1292-
!Context.getLangOpts().CPlusPlus2a))
1292+
!Context.getLangOpts().CPlusPlus20))
12931293
data().DefaultedDefaultConstructorIsConstexpr = false;
12941294

12951295
// C++11 [class.copy]p23:

‎clang/lib/AST/DeclTemplate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ NonTypeTemplateParmDecl::Create(const ASTContext &C, DeclContext *DC,
693693
QualType T, bool ParameterPack,
694694
TypeSourceInfo *TInfo) {
695695
AutoType *AT =
696-
C.getLangOpts().CPlusPlus2a ? T->getContainedAutoType() : nullptr;
696+
C.getLangOpts().CPlusPlus20 ? T->getContainedAutoType() : nullptr;
697697
return new (C, DC,
698698
additionalSizeToAlloc<std::pair<QualType, TypeSourceInfo *>,
699699
Expr *>(0,

‎clang/lib/AST/ExprConstant.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2579,7 +2579,7 @@ static bool handleIntIntBinOp(EvalInfo &Info, const Expr *E, const APSInt &LHS,
25792579
if (SA != RHS) {
25802580
Info.CCEDiag(E, diag::note_constexpr_large_shift)
25812581
<< RHS << E->getType() << LHS.getBitWidth();
2582-
} else if (LHS.isSigned() && !Info.getLangOpts().CPlusPlus2a) {
2582+
} else if (LHS.isSigned() && !Info.getLangOpts().CPlusPlus20) {
25832583
// C++11 [expr.shift]p2: A signed left shift must have a non-negative
25842584
// operand, and must not overflow the corresponding unsigned type.
25852585
// C++2a [expr.shift]p2: E1 << E2 is the unique value congruent to
@@ -4983,7 +4983,7 @@ static bool CheckConstexprFunction(EvalInfo &Info, SourceLocation CallLoc,
49834983
// DR1872: An instantiated virtual constexpr function can't be called in a
49844984
// constant expression (prior to C++20). We can still constant-fold such a
49854985
// call.
4986-
if (!Info.Ctx.getLangOpts().CPlusPlus2a && isa<CXXMethodDecl>(Declaration) &&
4986+
if (!Info.Ctx.getLangOpts().CPlusPlus20 && isa<CXXMethodDecl>(Declaration) &&
49874987
cast<CXXMethodDecl>(Declaration)->isVirtual())
49884988
Info.CCEDiag(CallLoc, diag::note_constexpr_virtual_call);
49894989

@@ -5595,7 +5595,7 @@ static bool HandleFunctionCall(SourceLocation CallLoc,
55955595
if (!handleLValueToRValueConversion(Info, Args[0], Args[0]->getType(), RHS,
55965596
RHSValue, MD->getParent()->isUnion()))
55975597
return false;
5598-
if (Info.getLangOpts().CPlusPlus2a && MD->isTrivial() &&
5598+
if (Info.getLangOpts().CPlusPlus20 && MD->isTrivial() &&
55995599
!HandleUnionActiveMemberChange(Info, Args[0], *This))
56005600
return false;
56015601
if (!handleAssignment(Info, Args[0], *This, MD->getThisType(),
@@ -6067,7 +6067,7 @@ static bool HandleOperatorNewCall(EvalInfo &Info, const CallExpr *E,
60676067
// This is permitted only within a call to std::allocator<T>::allocate.
60686068
auto Caller = Info.getStdAllocatorCaller("allocate");
60696069
if (!Caller) {
6070-
Info.FFDiag(E->getExprLoc(), Info.getLangOpts().CPlusPlus2a
6070+
Info.FFDiag(E->getExprLoc(), Info.getLangOpts().CPlusPlus20
60716071
? diag::note_constexpr_new_untyped
60726072
: diag::note_constexpr_new);
60736073
return false;
@@ -6849,7 +6849,7 @@ class ExprEvaluatorBase
68496849
return static_cast<Derived*>(this)->VisitCastExpr(E);
68506850
}
68516851
bool VisitCXXDynamicCastExpr(const CXXDynamicCastExpr *E) {
6852-
if (!Info.Ctx.getLangOpts().CPlusPlus2a)
6852+
if (!Info.Ctx.getLangOpts().CPlusPlus20)
68536853
CCEDiag(E, diag::note_constexpr_invalid_cast) << 1;
68546854
return static_cast<Derived*>(this)->VisitCastExpr(E);
68556855
}
@@ -7008,7 +7008,7 @@ class ExprEvaluatorBase
70087008
return Error(Callee);
70097009
This = &ThisVal;
70107010
} else if (const auto *PDE = dyn_cast<CXXPseudoDestructorExpr>(Callee)) {
7011-
if (!Info.getLangOpts().CPlusPlus2a)
7011+
if (!Info.getLangOpts().CPlusPlus20)
70127012
Info.CCEDiag(PDE, diag::note_constexpr_pseudo_destructor);
70137013
return EvaluateObjectArgument(Info, PDE->getBase(), ThisVal) &&
70147014
HandleDestruction(Info, PDE, ThisVal, PDE->getDestroyedType());
@@ -7714,7 +7714,7 @@ bool LValueExprEvaluator::VisitCXXTypeidExpr(const CXXTypeidExpr *E) {
77147714
else
77157715
TypeInfo = TypeInfoLValue(E->getExprOperand()->getType().getTypePtr());
77167716
} else {
7717-
if (!Info.Ctx.getLangOpts().CPlusPlus2a) {
7717+
if (!Info.Ctx.getLangOpts().CPlusPlus20) {
77187718
Info.CCEDiag(E, diag::note_constexpr_typeid_polymorphic)
77197719
<< E->getExprOperand()->getType()
77207720
<< E->getExprOperand()->getSourceRange();
@@ -7850,7 +7850,7 @@ bool LValueExprEvaluator::VisitBinAssign(const BinaryOperator *E) {
78507850
if (!Evaluate(NewVal, this->Info, E->getRHS()))
78517851
return false;
78527852

7853-
if (Info.getLangOpts().CPlusPlus2a &&
7853+
if (Info.getLangOpts().CPlusPlus20 &&
78547854
!HandleUnionActiveMemberChange(Info, E->getLHS(), Result))
78557855
return false;
78567856

@@ -8720,7 +8720,7 @@ static bool EvaluateArrayNewConstructExpr(EvalInfo &Info, LValue &This,
87208720
QualType AllocType);
87218721

87228722
bool PointerExprEvaluator::VisitCXXNewExpr(const CXXNewExpr *E) {
8723-
if (!Info.getLangOpts().CPlusPlus2a)
8723+
if (!Info.getLangOpts().CPlusPlus20)
87248724
Info.CCEDiag(E, diag::note_constexpr_new);
87258725

87268726
// We cannot speculatively evaluate a delete expression.
@@ -13585,7 +13585,7 @@ bool VoidExprEvaluator::VisitCXXDeleteExpr(const CXXDeleteExpr *E) {
1358513585
// This is the only case where we need to produce an extension warning:
1358613586
// the only other way we can succeed is if we find a dynamic allocation,
1358713587
// and we will have warned when we allocated it in that case.
13588-
if (!Info.getLangOpts().CPlusPlus2a)
13588+
if (!Info.getLangOpts().CPlusPlus20)
1358913589
Info.CCEDiag(E, diag::note_constexpr_new);
1359013590
return true;
1359113591
}

‎clang/lib/AST/Interp/Interp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ bool CheckCallable(InterpState &S, CodePtr OpPC, Function *F) {
334334
const SourceLocation &Loc = S.Current->getLocation(OpPC);
335335

336336
if (F->isVirtual()) {
337-
if (!S.getLangOpts().CPlusPlus2a) {
337+
if (!S.getLangOpts().CPlusPlus20) {
338338
S.CCEDiag(Loc, diag::note_constexpr_virtual_call);
339339
return false;
340340
}

‎clang/lib/AST/Interp/Interp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ inline bool ShiftRight(InterpState &S, CodePtr OpPC, const T &V, unsigned RHS) {
869869

870870
template <PrimType TL, PrimType TR, typename T = typename PrimConv<TL>::T>
871871
inline bool ShiftLeft(InterpState &S, CodePtr OpPC, const T &V, unsigned RHS) {
872-
if (V.isSigned() && !S.getLangOpts().CPlusPlus2a) {
872+
if (V.isSigned() && !S.getLangOpts().CPlusPlus20) {
873873
// C++11 [expr.shift]p2: A signed left shift must have a non-negative
874874
// operand, and must not overflow the corresponding unsigned type.
875875
// C++2a [expr.shift]p2: E1 << E2 is the unique value congruent to

‎clang/lib/Basic/IdentifierTable.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ namespace {
9797
KEYZVECTOR = 0x40000,
9898
KEYCOROUTINES = 0x80000,
9999
KEYMODULES = 0x100000,
100-
KEYCXX2A = 0x200000,
100+
KEYCXX20 = 0x200000,
101101
KEYOPENCLCXX = 0x400000,
102102
KEYMSCOMPAT = 0x800000,
103-
KEYALLCXX = KEYCXX | KEYCXX11 | KEYCXX2A,
103+
KEYALLCXX = KEYCXX | KEYCXX11 | KEYCXX20,
104104
KEYALL = (0xffffff & ~KEYNOMS18 &
105105
~KEYNOOPENCL) // KEYNOMS18 and KEYNOOPENCL are used to exclude.
106106
};
@@ -122,7 +122,7 @@ static KeywordStatus getKeywordStatus(const LangOptions &LangOpts,
122122
if (Flags == KEYALL) return KS_Enabled;
123123
if (LangOpts.CPlusPlus && (Flags & KEYCXX)) return KS_Enabled;
124124
if (LangOpts.CPlusPlus11 && (Flags & KEYCXX11)) return KS_Enabled;
125-
if (LangOpts.CPlusPlus2a && (Flags & KEYCXX2A)) return KS_Enabled;
125+
if (LangOpts.CPlusPlus20 && (Flags & KEYCXX20)) return KS_Enabled;
126126
if (LangOpts.C99 && (Flags & KEYC99)) return KS_Enabled;
127127
if (LangOpts.GNUKeywords && (Flags & KEYGNU)) return KS_Extension;
128128
if (LangOpts.MicrosoftExt && (Flags & KEYMS)) return KS_Extension;
@@ -142,7 +142,7 @@ static KeywordStatus getKeywordStatus(const LangOptions &LangOpts,
142142
// We treat bridge casts as objective-C keywords so we can warn on them
143143
// in non-arc mode.
144144
if (LangOpts.ObjC && (Flags & KEYOBJC)) return KS_Enabled;
145-
if (LangOpts.CPlusPlus2a && (Flags & KEYCONCEPTS)) return KS_Enabled;
145+
if (LangOpts.CPlusPlus20 && (Flags & KEYCONCEPTS)) return KS_Enabled;
146146
if (LangOpts.Coroutines && (Flags & KEYCOROUTINES)) return KS_Enabled;
147147
if (LangOpts.ModulesTS && (Flags & KEYMODULES)) return KS_Enabled;
148148
if (LangOpts.CPlusPlus && (Flags & KEYALLCXX)) return KS_Future;
@@ -257,7 +257,7 @@ bool IdentifierInfo::isCPlusPlusKeyword(const LangOptions &LangOpts) const {
257257
LangOptions LangOptsNoCPP = LangOpts;
258258
LangOptsNoCPP.CPlusPlus = false;
259259
LangOptsNoCPP.CPlusPlus11 = false;
260-
LangOptsNoCPP.CPlusPlus2a = false;
260+
LangOptsNoCPP.CPlusPlus20 = false;
261261
return !isKeyword(LangOptsNoCPP);
262262
}
263263

‎clang/lib/Basic/Targets/OSTargets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static void addVisualCDefines(const LangOptions &Opts, MacroBuilder &Builder) {
179179
Builder.defineMacro("_HAS_CHAR16_T_LANGUAGE_SUPPORT", Twine(1));
180180

181181
if (Opts.isCompatibleWithMSVC(LangOptions::MSVC2015)) {
182-
if (Opts.CPlusPlus2a)
182+
if (Opts.CPlusPlus20)
183183
Builder.defineMacro("_MSVC_LANG", "201705L");
184184
else if (Opts.CPlusPlus17)
185185
Builder.defineMacro("_MSVC_LANG", "201703L");

‎clang/lib/CodeGen/CGExprScalar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3792,7 +3792,7 @@ Value *ScalarExprEmitter::EmitShl(const BinOpInfo &Ops) {
37923792
bool SanitizeBase = CGF.SanOpts.has(SanitizerKind::ShiftBase) &&
37933793
Ops.Ty->hasSignedIntegerRepresentation() &&
37943794
!CGF.getLangOpts().isSignedOverflowDefined() &&
3795-
!CGF.getLangOpts().CPlusPlus2a;
3795+
!CGF.getLangOpts().CPlusPlus20;
37963796
bool SanitizeExponent = CGF.SanOpts.has(SanitizerKind::ShiftExponent);
37973797
// OpenCL 6.3j: shift values are effectively % word size of LHS.
37983798
if (CGF.getLangOpts().OpenCL)

‎clang/lib/CrossTU/CrossTranslationUnit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ llvm::Expected<const T *> CrossTranslationUnitContext::getCrossTUDefinitionImpl(
288288
if (LangTo.CPlusPlus11 != LangFrom.CPlusPlus11 ||
289289
LangTo.CPlusPlus14 != LangFrom.CPlusPlus14 ||
290290
LangTo.CPlusPlus17 != LangFrom.CPlusPlus17 ||
291-
LangTo.CPlusPlus2a != LangFrom.CPlusPlus2a) {
291+
LangTo.CPlusPlus20 != LangFrom.CPlusPlus20) {
292292
++NumLangDialectMismatch;
293293
return llvm::make_error<IndexError>(
294294
index_error_code::lang_dialect_mismatch);

‎clang/lib/Format/Format.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2621,7 +2621,7 @@ LangOptions getFormattingLangOpts(const FormatStyle &Style) {
26212621
LangOpts.CPlusPlus11 = LexingStd >= FormatStyle::LS_Cpp11;
26222622
LangOpts.CPlusPlus14 = LexingStd >= FormatStyle::LS_Cpp14;
26232623
LangOpts.CPlusPlus17 = LexingStd >= FormatStyle::LS_Cpp17;
2624-
LangOpts.CPlusPlus2a = LexingStd >= FormatStyle::LS_Cpp20;
2624+
LangOpts.CPlusPlus20 = LexingStd >= FormatStyle::LS_Cpp20;
26252625

26262626
LangOpts.LineComment = 1;
26272627
bool AlternativeOperators = Style.isCpp();

0 commit comments

Comments
 (0)