[cfe-commits] r119968 - in /cfe/trunk/lib/Parse: ParseDecl.cpp ParseExprCXX.cpp

[Nico Weber]

Author: nico
Date: Mon Nov 22 06:50:03 2010
New Revision: 119968

URL: http://llvm.org/viewvc/llvm-project?rev=119968&view=rev
Log:
Try to get the bots green after r119966.

Modified:
    cfe/trunk/lib/Parse/ParseDecl.cpp
    cfe/trunk/lib/Parse/ParseExprCXX.cpp

Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=119968&r1=119967&r2=119968&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDecl.cpp Mon Nov 22 06:50:03 2010
@@ -1083,8 +1083,9 @@
     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();

Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=119968&r1=119967&r2=119968&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExprCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExprCXX.cpp Mon Nov 22 06:50:03 2010
@@ -912,8 +912,10 @@
 
   // 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();