aboutsummaryrefslogtreecommitdiff
path: root/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
commit640519e971af2bfe82d093d555146bdeecc8cc39 (patch)
tree46429b6a5a88d5c98a64d11e90a77daa58713d27 /lib/Parse/ParseExprCXX.cpp
parent2cb4222338669a3e70b546ef264fbd5d3f96aef5 (diff)
Fix some regressions in the GCC testsuite due to bad souce-location
information. Fixes <rdar://problem/9063643>. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126721 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseExprCXX.cpp')
-rw-r--r--lib/Parse/ParseExprCXX.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index a059e0b75a..823c08c999 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/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;