From 5b20025c30d23d521e12c1f33ec8fa6b821952cd Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sat, 22 Dec 2012 15:00:54 +0000
Subject: 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
---
lib/Parse/ParseDeclCXX.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'lib/Parse/ParseDeclCXX.cpp')
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.
--
cgit v1.1