Author: fjahanian
Date: Tue Apr 19 16:42:37 2011
New Revision: 129822
URL: http://llvm.org/viewvc/llvm-project?rev=129822&view=rev
Log:
Avoid superfluous warning after an error is detcted and reported.
// rdar://9132143
Modified:
cfe/trunk/lib/Parse/ParseDecl.cpp
cfe/trunk/test/Parser/cxx-decl.cpp
Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=129822&r1=129821&r2=129822&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDecl.cpp Tue Apr 19 16:42:37 2011
@@ -1735,6 +1735,8 @@
DS.getStorageClassSpec() == DeclSpec::SCS_typedef) {
PrevSpec = ""; // Not used by the diagnostic.
DiagID = diag::err_bool_redeclaration;
+ // For better error recovery.
+ Tok.setKind(tok::identifier);
isInvalid = true;
} else {
isInvalid = DS.SetTypeSpecType(DeclSpec::TST_bool, Loc, PrevSpec,
@@ -1856,7 +1858,8 @@
}
DS.SetRangeEnd(Tok.getLocation());
- ConsumeToken();
+ if (DiagID != diag::err_bool_redeclaration)
+ ConsumeToken();
}
}
Modified: cfe/trunk/test/Parser/cxx-decl.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx-decl.cpp?rev=129822&r1=129821&r2=129822&view=diff
==============================================================================
--- cfe/trunk/test/Parser/cxx-decl.cpp (original)
+++ cfe/trunk/test/Parser/cxx-decl.cpp Tue Apr 19 16:42:37 2011
@@ -7,8 +7,8 @@
};
// rdar://8365458
-typedef char bool; // expected-error {{redeclaration of C++ built-in type
'bool'}} \
- // expected-warning {{declaration does not declare
anything}}
+// rdar://9132143
+typedef char bool; // expected-error {{redeclaration of C++ built-in type
'bool'}}
// PR4451 - We should recover well from the typo of '::' as ':' in a2.
namespace y {
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
