cor3ntin updated this revision to Diff 377755.
cor3ntin marked an inline comment as done.
cor3ntin added a comment.
- Modify ParseUsingDeclaration to only parse an alias in init statememts
- Make the c++23 extebsion warning clearer
- Nitpicks.
The error is now 'expected '=', which seems good enough in that scenario.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D111175/new/
https://reviews.llvm.org/D111175
Files:
clang/include/clang/Basic/DiagnosticParseKinds.td
clang/include/clang/Parse/Parser.h
clang/lib/Parse/ParseDeclCXX.cpp
clang/lib/Parse/ParseExprCXX.cpp
clang/lib/Parse/ParseStmt.cpp
clang/lib/Parse/ParseTentative.cpp
clang/test/Parser/cxx2b-init-statement.cpp
clang/test/SemaCXX/cxx2b-init-statement.cpp
clang/www/cxx_status.html
Index: clang/www/cxx_status.html
===================================================================
--- clang/www/cxx_status.html
+++ clang/www/cxx_status.html
@@ -1365,7 +1365,7 @@
<tr>
<td>Extend init-statement to allow alias-declaration</td>
<td><a href="https://wg21.link/P2360R0";>P2360R0</a></td>
- <td class="none" align="center">No</td>
+ <td class="unreleased" align="center">Clang 14</td>
</tr>
</table>
Index: clang/test/SemaCXX/cxx2b-init-statement.cpp
===================================================================
--- /dev/null
+++ clang/test/SemaCXX/cxx2b-init-statement.cpp
@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -verify -std=c++2b -Wall -Wshadow %s
+
+void f() {
+
+ for (using foo = int;true;) {} //expected-warning {{unused type alias 'foo'}}
+
+ switch(using foo = int; 0) { //expected-warning {{unused type alias 'foo'}}
+ case 0: break;
+ }
+
+ if(using foo = int; false) {} // expected-warning {{unused type alias 'foo'}}
+
+ int x; // expected-warning {{unused variable 'x'}}
+ if(using x = int; true) {} // expected-warning {{unused type alias 'x'}}
+
+ using y = int; // expected-warning {{unused type alias 'y'}} \
+ // expected-note 2{{previous declaration is here}}
+
+ if(using y = double; true) {} // expected-warning {{unused type alias 'y'}} \
+ // expected-warning {{declaration shadows a type alias in function 'f'}}
+
+ for(using y = double; true;) { // expected-warning {{declaration shadows a type alias in function 'f'}}
+ y foo = 0;
+ (void)foo;
+ constexpr y var = 0;
+ static_assert(var == 0);
+ }
+}
Index: clang/test/Parser/cxx2b-init-statement.cpp
===================================================================
--- /dev/null
+++ clang/test/Parser/cxx2b-init-statement.cpp
@@ -0,0 +1,29 @@
+// RUN: %clang_cc1 -fsyntax-only -verify=expected -std=c++2b -Wall %s
+// RUN: %clang_cc1 -fsyntax-only -verify=expected,expected-cxx20 -std=c++20 -Wall %s
+
+namespace ns {
+ int i;
+ enum class e {};
+}
+void f() {
+
+ for (using foo = int;true;); //expected-cxx20-warning {{alias declaration in this context is a C++2b extension}}
+
+ switch(using foo = int; 0) { //expected-cxx20-warning {{alias declaration in this context is a C++2b extension}}
+ case 0: break;
+ }
+
+ if(using foo = int; false) {} //expected-cxx20-warning {{alias declaration in this context is a C++2b extension}}
+
+
+ if (using enum ns::e; false){} // expected-error {{expected '='}}
+
+ for (using ns::i; true;); // expected-error {{expected '='}}
+
+ if (using ns::i; false){} // expected-error {{expected '='}}
+
+ switch(using ns::i; 0) { // expected-error {{expected '='}}
+ case 0: break;
+ }
+
+}
Index: clang/lib/Parse/ParseTentative.cpp
===================================================================
--- clang/lib/Parse/ParseTentative.cpp
+++ clang/lib/Parse/ParseTentative.cpp
@@ -483,7 +483,9 @@
ConditionDeclarationOrInitStatementState State(*this, CanBeInitStatement,
CanBeForRangeDecl);
- if (State.update(isCXXDeclarationSpecifier()))
+ if (CanBeInitStatement && Tok.is(tok::kw_using)) {
+ return ConditionOrInitStatement::InitStmtDecl;
+ } else if (State.update(isCXXDeclarationSpecifier()))
return State.result();
// It might be a declaration; we need tentative parsing.
Index: clang/lib/Parse/ParseStmt.cpp
===================================================================
--- clang/lib/Parse/ParseStmt.cpp
+++ clang/lib/Parse/ParseStmt.cpp
@@ -1823,6 +1823,7 @@
/// [C++] for-init-statement:
/// [C++] expression-statement
/// [C++] simple-declaration
+/// [C++2b] alias-declaration
///
/// [C++0x] for-range-declaration:
/// [C++0x] attribute-specifier-seq[opt] type-specifier-seq declarator
@@ -1928,36 +1929,42 @@
Diag(Tok, diag::ext_c99_variable_decl_in_for_loop);
Diag(Tok, diag::warn_gcc_variable_decl_in_for_loop);
}
+ DeclGroupPtrTy DG;
+ if (Tok.is(tok::kw_using)) {
+ DG = ParseAliasDeclarationInInitStatement(DeclaratorContext::ForInit,
+ attrs);
+ } else {
+ // In C++0x, "for (T NS:a" might not be a typo for ::
+ bool MightBeForRangeStmt = getLangOpts().CPlusPlus;
+ ColonProtectionRAIIObject ColonProtection(*this, MightBeForRangeStmt);
- // In C++0x, "for (T NS:a" might not be a typo for ::
- bool MightBeForRangeStmt = getLangOpts().CPlusPlus;
- ColonProtectionRAIIObject ColonProtection(*this, MightBeForRangeStmt);
-
- SourceLocation DeclStart = Tok.getLocation(), DeclEnd;
- DeclGroupPtrTy DG = ParseSimpleDeclaration(
- DeclaratorContext::ForInit, DeclEnd, attrs, false,
- MightBeForRangeStmt ? &ForRangeInfo : nullptr);
- FirstPart = Actions.ActOnDeclStmt(DG, DeclStart, Tok.getLocation());
- if (ForRangeInfo.ParsedForRangeDecl()) {
- Diag(ForRangeInfo.ColonLoc, getLangOpts().CPlusPlus11 ?
- diag::warn_cxx98_compat_for_range : diag::ext_for_range);
- ForRangeInfo.LoopVar = FirstPart;
- FirstPart = StmtResult();
- } else if (Tok.is(tok::semi)) { // for (int x = 4;
- ConsumeToken();
- } else if ((ForEach = isTokIdentifier_in())) {
- Actions.ActOnForEachDeclStmt(DG);
- // ObjC: for (id x in expr)
- ConsumeToken(); // consume 'in'
-
- if (Tok.is(tok::code_completion)) {
- cutOffParsing();
- Actions.CodeCompleteObjCForCollection(getCurScope(), DG);
- return StmtError();
+ SourceLocation DeclStart = Tok.getLocation(), DeclEnd;
+ DG = ParseSimpleDeclaration(
+ DeclaratorContext::ForInit, DeclEnd, attrs, false,
+ MightBeForRangeStmt ? &ForRangeInfo : nullptr);
+ FirstPart = Actions.ActOnDeclStmt(DG, DeclStart, Tok.getLocation());
+ if (ForRangeInfo.ParsedForRangeDecl()) {
+ Diag(ForRangeInfo.ColonLoc, getLangOpts().CPlusPlus11
+ ? diag::warn_cxx98_compat_for_range
+ : diag::ext_for_range);
+ ForRangeInfo.LoopVar = FirstPart;
+ FirstPart = StmtResult();
+ } else if (Tok.is(tok::semi)) { // for (int x = 4;
+ ConsumeToken();
+ } else if ((ForEach = isTokIdentifier_in())) {
+ Actions.ActOnForEachDeclStmt(DG);
+ // ObjC: for (id x in expr)
+ ConsumeToken(); // consume 'in'
+
+ if (Tok.is(tok::code_completion)) {
+ cutOffParsing();
+ Actions.CodeCompleteObjCForCollection(getCurScope(), DG);
+ return StmtError();
+ }
+ Collection = ParseExpression();
+ } else {
+ Diag(Tok, diag::err_expected_semi_for);
}
- Collection = ParseExpression();
- } else {
- Diag(Tok, diag::err_expected_semi_for);
}
} else {
ProhibitAttributes(attrs);
Index: clang/lib/Parse/ParseExprCXX.cpp
===================================================================
--- clang/lib/Parse/ParseExprCXX.cpp
+++ clang/lib/Parse/ParseExprCXX.cpp
@@ -1910,6 +1910,28 @@
}
}
+Parser::DeclGroupPtrTy
+Parser::ParseAliasDeclarationInInitStatement(DeclaratorContext Context,
+ ParsedAttributesWithRange &attrs) {
+ assert(Tok.is(tok::kw_using) && "Expected using");
+ assert((Context == DeclaratorContext::ForInit ||
+ Context == DeclaratorContext::SelectionInit) &&
+ "Unexpected Declarator Context");
+ DeclGroupPtrTy DG;
+ SourceLocation DeclStart = ConsumeToken(), DeclEnd;
+
+ DG = ParseUsingDeclaration(Context, {}, DeclStart, DeclEnd, attrs, AS_none);
+ if (!DG)
+ return DG;
+
+ if (!getLangOpts().CPlusPlus2b) {
+ Diag(DeclStart, diag::ext_alias_in_init_statement)
+ << SourceRange(DeclStart, DeclEnd);
+ }
+
+ return DG;
+}
+
/// ParseCXXCondition - if/switch/while condition expression.
///
/// condition:
@@ -2017,9 +2039,15 @@
case ConditionOrInitStatement::InitStmtDecl: {
WarnOnInit();
+ DeclGroupPtrTy DG;
SourceLocation DeclStart = Tok.getLocation(), DeclEnd;
- DeclGroupPtrTy DG = ParseSimpleDeclaration(
- DeclaratorContext::SelectionInit, DeclEnd, attrs, /*RequireSemi=*/true);
+ if (Tok.is(tok::kw_using))
+ DG = ParseAliasDeclarationInInitStatement(
+ DeclaratorContext::SelectionInit, attrs);
+ else {
+ DG = ParseSimpleDeclaration(DeclaratorContext::SelectionInit, DeclEnd,
+ attrs, /*RequireSemi=*/true);
+ }
*InitStmt = Actions.ActOnDeclStmt(DG, DeclStart, DeclEnd);
return ParseCXXCondition(nullptr, Loc, CK);
}
Index: clang/lib/Parse/ParseDeclCXX.cpp
===================================================================
--- clang/lib/Parse/ParseDeclCXX.cpp
+++ clang/lib/Parse/ParseDeclCXX.cpp
@@ -678,7 +678,10 @@
SourceLocation UsingLoc, SourceLocation &DeclEnd,
ParsedAttributesWithRange &PrefixAttrs, AccessSpecifier AS) {
SourceLocation UELoc;
- if (TryConsumeToken(tok::kw_enum, UELoc)) {
+ bool InInitStatement = Context == DeclaratorContext::SelectionInit ||
+ Context == DeclaratorContext::ForInit;
+
+ if (TryConsumeToken(tok::kw_enum, UELoc) && !InInitStatement) {
// C++20 using-enum
Diag(UELoc, getLangOpts().CPlusPlus20
? diag::warn_cxx17_compat_using_enum_declaration
@@ -714,6 +717,10 @@
ParsedAttributesWithRange MisplacedAttrs(AttrFactory);
MaybeParseCXX11Attributes(MisplacedAttrs);
+ if (InInitStatement && Tok.isNot(tok::identifier)) {
+ return nullptr;
+ }
+
UsingDeclarator D;
bool InvalidDeclarator = ParseUsingDeclarator(Context, D);
@@ -732,7 +739,7 @@
}
// Maybe this is an alias-declaration.
- if (Tok.is(tok::equal)) {
+ if (Tok.is(tok::equal) || InInitStatement) {
if (InvalidDeclarator) {
SkipUntil(tok::semi);
return nullptr;
Index: clang/include/clang/Parse/Parser.h
===================================================================
--- clang/include/clang/Parse/Parser.h
+++ clang/include/clang/Parse/Parser.h
@@ -1977,6 +1977,9 @@
Sema::ConditionKind CK,
ForRangeInfo *FRI = nullptr,
bool EnterForConditionScope = false);
+ DeclGroupPtrTy
+ ParseAliasDeclarationInInitStatement(DeclaratorContext Context,
+ ParsedAttributesWithRange &attrs);
//===--------------------------------------------------------------------===//
// C++ Coroutines
@@ -2396,7 +2399,8 @@
if (getLangOpts().OpenMP)
Actions.startOpenMPLoop();
if (getLangOpts().CPlusPlus)
- return isCXXSimpleDeclaration(/*AllowForRangeDecl=*/true);
+ return Tok.is(tok::kw_using) ||
+ isCXXSimpleDeclaration(/*AllowForRangeDecl=*/true);
return isDeclarationSpecifier(true);
}
Index: clang/include/clang/Basic/DiagnosticParseKinds.td
===================================================================
--- clang/include/clang/Basic/DiagnosticParseKinds.td
+++ clang/include/clang/Basic/DiagnosticParseKinds.td
@@ -549,6 +549,9 @@
"variable declaration in condition cannot have a parenthesized initializer">;
def err_extraneous_rparen_in_condition : Error<
"extraneous ')' after condition, expected a statement">;
+def ext_alias_in_init_statement : ExtWarn<
+ "alias declaration in this context is a C++2b extension">,
+ InGroup<CXX2b>;
def warn_dangling_else : Warning<
"add explicit braces to avoid dangling else">,
InGroup<DanglingElse>;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
