From 7f8bb368ea78481d3cfd7126912a34f4d86fe826 Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Mon, 22 Nov 2010 12:50:03 +0000
Subject: [PATCH] Try to get the bots green after r119966.

llvm-svn: 119968
---
 clang/lib/Parse/ParseDecl.cpp    | 5 +++--
 clang/lib/Parse/ParseExprCXX.cpp | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index 36054a9958af..79fc198ab494 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -1083,8 +1083,9 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
     case tok::annot_typename: {
       if (Tok.getAnnotationValue()) {
         ParsedType T = getTypeAnnotation(Tok);
-        isInvalid = DS.SetTypeSpecType(DeclSpec::TST_typename,
-                                       Tok.getAnnotationEndLoc(), PrevSpec,
+        // FIXME: This should probably pass getAnnotationEndLoc() instead of
+        // Loc, but that breaks test/Index/recursive-cxx-member-calls.cpp.
+        isInvalid = DS.SetTypeSpecType(DeclSpec::TST_typename, Loc, PrevSpec,
                                        DiagID, T);
       } else
         DS.SetTypeSpecError();
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index 24a1274b01a8..e027e28e9adf 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -912,8 +912,10 @@ void Parser::ParseCXXSimpleTypeSpecifier(DeclSpec &DS) {
 
   // type-name
   case tok::annot_typename: {
-    DS.SetTypeSpecType(DeclSpec::TST_typename, Tok.getAnnotationEndLoc(),
-                       PrevSpec, DiagID, getTypeAnnotation(Tok));
+    // FIXME: This should probably pass getAnnotationEndLoc() instead of Loc,
+    // but that breaks test/Index/recursive-cxx-member-calls.cpp.
+    DS.SetTypeSpecType(DeclSpec::TST_typename, Loc, PrevSpec, DiagID,
+                       getTypeAnnotation(Tok));
     
     DS.SetRangeEnd(Tok.getAnnotationEndLoc());
     ConsumeToken();