From: Chris Lattner <sabre@nondot.org>
Date: Mon, 7 Dec 2009 00:48:47 +0000 (+0000)
Subject: fix a crash on invalid I found when working on something unrelated.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd87c0bd2358498eae71c6cb24e57d2c884c74aa;p=clang

fix a crash on invalid I found when working on something unrelated.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90729 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index ca425e8b05..20e5c589d7 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -1030,7 +1030,9 @@ bool Parser::TryAnnotateCXXScopeToken(bool EnteringContext) {
 
   CXXScopeSpec SS;
   if (!ParseOptionalCXXScopeSpecifier(SS, /*ObjectType=*/0, EnteringContext))
-    return Tok.is(tok::annot_template_id);
+    // If the token left behind is not an identifier, we either had an error or
+    // successfully turned it into an annotation token.
+    return Tok.isNot(tok::identifier);
 
   // Push the current token back into the token stream (or revert it if it is
   // cached) and use an annotation scope token for current token.
diff --git a/test/Parser/cxx-friend.cpp b/test/Parser/cxx-friend.cpp
index 14b31af761..6505ad0f6f 100644
--- a/test/Parser/cxx-friend.cpp
+++ b/test/Parser/cxx-friend.cpp
@@ -30,3 +30,11 @@ class B {
   void f(A *a) { a->f(); }
 };
 
+
+
+
+
+template <typename t1, typename t2> class some_template;
+friend   // expected-error {{'friend' used outside of class}}
+some_template<foo, bar>&  // expected-error {{use of undeclared identifier 'foo'}}
+  ;  // expected-error {{expected unqualified-id}}