cor3ntin created this revision.
Herald added a project: All.
cor3ntin requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
with multiple declarations followed by a colon.
Fixes #63010
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D152009
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Parse/ParseExprCXX.cpp
clang/lib/Parse/ParseStmt.cpp
clang/test/Parser/cxx0x-for-range.cpp
clang/test/Parser/objc-foreach-syntax.m
Index: clang/test/Parser/objc-foreach-syntax.m
===================================================================
--- clang/test/Parser/objc-foreach-syntax.m
+++ clang/test/Parser/objc-foreach-syntax.m
@@ -11,18 +11,16 @@
int LOOP(void);
-@implementation MyList (BasicTest)
+@implementation MyList (BasicTest)
- (void)compilerTestAgainst {
-MyList * el;
- for (el in @"foo")
+MyList * el;
+ for (el in @"foo")
{ LOOP(); }
}
@end
static int test7(id keys) {
- // FIXME: would be nice to suppress the secondary diagnostics.
for (id key; in keys) ; // expected-error {{use of undeclared identifier
'in'}} \
- // expected-error {{expected ';' in 'for' statement
specifier}} \
- // expected-warning {{expression result unused}}
+ // expected-error {{expected ';' in 'for' statement
specifier}}
}
Index: clang/test/Parser/cxx0x-for-range.cpp
===================================================================
--- clang/test/Parser/cxx0x-for-range.cpp
+++ clang/test/Parser/cxx0x-for-range.cpp
@@ -60,3 +60,12 @@
}
}
}
+
+namespace GH63010 {
+void foo(int n) {
+ int a[] = {1, 2, 3, 4, 5};
+ for (auto x = n ? 1 : 2 : a); // expected-error {{expected ';' in 'for'
statement specifier}} \
+ // expected-error {{expected expression}}
+ for (int i = 1; auto x = n ? 1 : 2 : a); // expected-error {{expected ';'
in 'for' statement specifier}}
+}
+}
Index: clang/lib/Parse/ParseStmt.cpp
===================================================================
--- clang/lib/Parse/ParseStmt.cpp
+++ clang/lib/Parse/ParseStmt.cpp
@@ -2197,9 +2197,7 @@
if (Tok.isNot(tok::semi)) {
if (!SecondPart.isInvalid())
Diag(Tok, diag::err_expected_semi_for);
- else
- // Skip until semicolon or rparen, don't consume it.
- SkipUntil(tok::r_paren, StopAtSemi | StopBeforeMatch);
+ SkipUntil(tok::r_paren, StopAtSemi | StopBeforeMatch);
}
if (Tok.is(tok::semi)) {
Index: clang/lib/Parse/ParseExprCXX.cpp
===================================================================
--- clang/lib/Parse/ParseExprCXX.cpp
+++ clang/lib/Parse/ParseExprCXX.cpp
@@ -2138,8 +2138,6 @@
DeclGroupPtrTy DG = ParseSimpleDeclaration(
DeclaratorContext::ForInit, DeclEnd, attrs, DeclSpecAttrs, false, FRI);
FRI->LoopVar = Actions.ActOnDeclStmt(DG, DeclStart, Tok.getLocation());
- assert((FRI->ColonLoc.isValid() || !DG) &&
- "cannot find for range declaration");
return Sema::ConditionResult();
}
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -455,6 +455,9 @@
- Fix crash when diagnosing default comparison method.
(`#62791 <https://github.com/llvm/llvm-project/issues/62791>`_) and
(`#62102 <https://github.com/llvm/llvm-project/issues/62102>`_).
+- Fix assertion and quality of diagnostic messages in a for loop
+ containing multiple declarations and a range specifier
+ (`#63010 <https://github.com/llvm/llvm-project/issues/63010>`_).
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Index: clang/test/Parser/objc-foreach-syntax.m
===================================================================
--- clang/test/Parser/objc-foreach-syntax.m
+++ clang/test/Parser/objc-foreach-syntax.m
@@ -11,18 +11,16 @@
int LOOP(void);
-@implementation MyList (BasicTest)
+@implementation MyList (BasicTest)
- (void)compilerTestAgainst {
-MyList * el;
- for (el in @"foo")
+MyList * el;
+ for (el in @"foo")
{ LOOP(); }
}
@end
static int test7(id keys) {
- // FIXME: would be nice to suppress the secondary diagnostics.
for (id key; in keys) ; // expected-error {{use of undeclared identifier 'in'}} \
- // expected-error {{expected ';' in 'for' statement specifier}} \
- // expected-warning {{expression result unused}}
+ // expected-error {{expected ';' in 'for' statement specifier}}
}
Index: clang/test/Parser/cxx0x-for-range.cpp
===================================================================
--- clang/test/Parser/cxx0x-for-range.cpp
+++ clang/test/Parser/cxx0x-for-range.cpp
@@ -60,3 +60,12 @@
}
}
}
+
+namespace GH63010 {
+void foo(int n) {
+ int a[] = {1, 2, 3, 4, 5};
+ for (auto x = n ? 1 : 2 : a); // expected-error {{expected ';' in 'for' statement specifier}} \
+ // expected-error {{expected expression}}
+ for (int i = 1; auto x = n ? 1 : 2 : a); // expected-error {{expected ';' in 'for' statement specifier}}
+}
+}
Index: clang/lib/Parse/ParseStmt.cpp
===================================================================
--- clang/lib/Parse/ParseStmt.cpp
+++ clang/lib/Parse/ParseStmt.cpp
@@ -2197,9 +2197,7 @@
if (Tok.isNot(tok::semi)) {
if (!SecondPart.isInvalid())
Diag(Tok, diag::err_expected_semi_for);
- else
- // Skip until semicolon or rparen, don't consume it.
- SkipUntil(tok::r_paren, StopAtSemi | StopBeforeMatch);
+ SkipUntil(tok::r_paren, StopAtSemi | StopBeforeMatch);
}
if (Tok.is(tok::semi)) {
Index: clang/lib/Parse/ParseExprCXX.cpp
===================================================================
--- clang/lib/Parse/ParseExprCXX.cpp
+++ clang/lib/Parse/ParseExprCXX.cpp
@@ -2138,8 +2138,6 @@
DeclGroupPtrTy DG = ParseSimpleDeclaration(
DeclaratorContext::ForInit, DeclEnd, attrs, DeclSpecAttrs, false, FRI);
FRI->LoopVar = Actions.ActOnDeclStmt(DG, DeclStart, Tok.getLocation());
- assert((FRI->ColonLoc.isValid() || !DG) &&
- "cannot find for range declaration");
return Sema::ConditionResult();
}
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -455,6 +455,9 @@
- Fix crash when diagnosing default comparison method.
(`#62791 <https://github.com/llvm/llvm-project/issues/62791>`_) and
(`#62102 <https://github.com/llvm/llvm-project/issues/62102>`_).
+- Fix assertion and quality of diagnostic messages in a for loop
+ containing multiple declarations and a range specifier
+ (`#63010 <https://github.com/llvm/llvm-project/issues/63010>`_).
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
