summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseExprCXX.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-03-01 00:34:57 +0000
committerDouglas Gregor <dgregor@apple.com>2011-03-01 00:34:57 +0000
commitff42ec5895dab25585843d77e9331bcc16b209fe (patch)
tree0d778d9febd00d6c5f22d0e07645d6d053981db8 /clang/lib/Parse/ParseExprCXX.cpp
parent683bbc16c49fc819f4c1a73571e4f6b8b4976356 (diff)
downloadbcm5719-llvm-ff42ec5895dab25585843d77e9331bcc16b209fe.tar.gz
bcm5719-llvm-ff42ec5895dab25585843d77e9331bcc16b209fe.zip
Fix some regressions in the GCC testsuite due to bad souce-location
information. Fixes <rdar://problem/9063643>. llvm-svn: 126721
Diffstat (limited to 'clang/lib/Parse/ParseExprCXX.cpp')
-rw-r--r--clang/lib/Parse/ParseExprCXX.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index a059e0b75a8..823c08c999d 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -221,8 +221,12 @@ bool Parser::ParseOptionalCXXScopeSpecifier(CXXScopeSpec &SS,
TemplateArgsPtr,
TemplateId->RAngleLoc,
CCLoc,
- EnteringContext))
- SS.SetInvalid(SourceRange(SS.getBeginLoc(), CCLoc));
+ EnteringContext)) {
+ SourceLocation StartLoc
+ = SS.getBeginLoc().isValid()? SS.getBeginLoc()
+ : TemplateId->TemplateNameLoc;
+ SS.SetInvalid(SourceRange(StartLoc, CCLoc));
+ }
TemplateId->Destroy();
continue;
OpenPOWER on IntegriCloud