summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse
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
commitfa933d12255d2d9ed3c447da542fdf00a5c26f70 (patch)
treefb5d2cb1ebebf41f13b4900829ea6ae325c14428 /clang/lib/Parse
parent317640dfd0908e286ad9f2818b007340e0ee3c77 (diff)
downloadbcm5719-llvm-fa933d12255d2d9ed3c447da542fdf00a5c26f70.tar.gz
bcm5719-llvm-fa933d12255d2d9ed3c447da542fdf00a5c26f70.zip
Fix decltype crash-on-invalid, if we don't find a matching ')' for an ill-formed
decltype expression. llvm-svn: 151515
Diffstat (limited to 'clang/lib/Parse')
-rw-r--r--clang/lib/Parse/ParseDeclCXX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index d798281f40f..3bf7005769e 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/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 ')'
OpenPOWER on IntegriCloud