diff options
| author | dim <dim@FreeBSD.org> | 2012-12-22 15:00:54 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-12-22 15:00:54 +0000 |
| commit | 5b20025c30d23d521e12c1f33ec8fa6b821952cd (patch) | |
| tree | d97cbb4c3a7d0c7da83f0baa1fa220f188e9c6df /lib/Parse/ParseDeclCXX.cpp | |
| parent | 056abd2059c65a3e908193aeae16fad98017437c (diff) | |
| download | FreeBSD-src-5b20025c30d23d521e12c1f33ec8fa6b821952cd.zip FreeBSD-src-5b20025c30d23d521e12c1f33ec8fa6b821952cd.tar.gz | |
Vendor import of clang tags/RELEASE_32/final r170710 (effectively, 3.2
release):
http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_32/final@170710
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 4cb14e2..f11a9d1 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -706,8 +706,7 @@ SourceLocation Parser::ParseDecltypeSpecifier(DeclSpec &DS) { if (SkipUntil(tok::r_paren, /*StopAtSemi=*/true, /*DontConsume=*/true)) { EndLoc = ConsumeParen(); } else { - assert(Tok.is(tok::semi)); - if (PP.isBacktrackEnabled()) { + if (PP.isBacktrackEnabled() && Tok.is(tok::semi)) { // Backtrack to get the location of the last token before the semi. PP.RevertCachedTokens(2); ConsumeToken(); // the semi. |
