summaryrefslogtreecommitdiffstats
path: root/lib/Parse/ParseDeclCXX.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-02-27 05:24:00 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-02-27 05:24:00 +0000
commitd8e4daca4a44d25a9c09d51def9e3d485d4f302c (patch)
tree0154228b3b70b90e48041995b76ec481e77f1208 /lib/Parse/ParseDeclCXX.cpp
parentdbe01bb024ce9407954275a5e3c7e1a7113ca9fa (diff)
Fix decltype crash-on-invalid, if we don't find a matching ')' for an ill-formed
decltype expression. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151515 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
-rw-r--r--lib/Parse/ParseDeclCXX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index d798281f40..3bf7005769 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -674,9 +674,9 @@ SourceLocation Parser::ParseDecltypeSpecifier(DeclSpec &DS) {
0, /*IsDecltype=*/true);
Result = ParseExpression();
if (Result.isInvalid()) {
- SkipUntil(tok::r_paren, true, true);
+ SkipUntil(tok::r_paren);
DS.SetTypeSpecError();
- return Tok.is(tok::eof) ? Tok.getLocation() : ConsumeParen();
+ return StartLoc;
}
// Match the ')'