fix PR6782, an accept invalid. We weren't emitting the diagnostic
returned by SetTypeSpecType.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100443 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index e87d052..c85b6ee 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -334,7 +334,7 @@
SingleDecl = ParseStaticAssertDeclaration(DeclEnd);
break;
default:
- return ParseSimpleDeclaration(Context, DeclEnd, Attr.AttrList);
+ return ParseSimpleDeclaration(Context, DeclEnd, Attr.AttrList, true);
}
// This routine returns a DeclGroup, if the thing we parsed only contains a
@@ -348,10 +348,11 @@
/// [OMP] threadprivate-directive [TODO]
///
/// If RequireSemi is false, this does not check for a ';' at the end of the
-/// declaration.
+/// declaration. If it is true, it checks for and eats it.
Parser::DeclGroupPtrTy Parser::ParseSimpleDeclaration(unsigned Context,
SourceLocation &DeclEnd,
- AttributeList *Attr) {
+ AttributeList *Attr,
+ bool RequireSemi) {
// Parse the common declaration-specifiers piece.
ParsingDeclSpec DS(*this);
if (Attr)
@@ -362,15 +363,13 @@
// C99 6.7.2.3p6: Handle "struct-or-union identifier;", "enum { X };"
// declaration-specifiers init-declarator-list[opt] ';'
if (Tok.is(tok::semi)) {
- ConsumeToken();
+ if (RequireSemi) ConsumeToken();
DeclPtrTy TheDecl = Actions.ParsedFreeStandingDeclSpec(CurScope, DS);
DS.complete(TheDecl);
return Actions.ConvertDeclToDeclGroup(TheDecl);
}
- DeclGroupPtrTy DG = ParseDeclGroup(DS, Context, /*FunctionDefs=*/ false,
- &DeclEnd);
- return DG;
+ return ParseDeclGroup(DS, Context, /*FunctionDefs=*/ false, &DeclEnd);
}
/// ParseDeclGroup - Having concluded that this is either a function
@@ -999,6 +998,10 @@
DiagID, Tok.getAnnotationValue());
else
DS.SetTypeSpecError();
+
+ if (isInvalid)
+ break;
+
DS.SetRangeEnd(Tok.getAnnotationEndLoc());
ConsumeToken(); // The typename
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp
index b752b48..b208c50 100644
--- a/lib/Parse/ParseStmt.cpp
+++ b/lib/Parse/ParseStmt.cpp
@@ -997,7 +997,7 @@
SourceLocation DeclStart = Tok.getLocation(), DeclEnd;
DeclGroupPtrTy DG = ParseSimpleDeclaration(Declarator::ForContext, DeclEnd,
- AttrList);
+ AttrList, false);
FirstPart = Actions.ActOnDeclStmt(DG, DeclStart, Tok.getLocation());
if (Tok.is(tok::semi)) { // for (int x = 4;