From ff42ec5895dab25585843d77e9331bcc16b209fe Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Tue, 1 Mar 2011 00:34:57 +0000
Subject: Fix some regressions in the GCC testsuite due to bad souce-location
 information. Fixes <rdar://problem/9063643>.

llvm-svn: 126721
---
 clang/lib/Parse/ParseExprCXX.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'clang/lib/Parse/ParseExprCXX.cpp')

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;
-- 
cgit v1.2.3