Fix screwup with my previous patch which broke tests.  (The patch is 
making sure we return true when annotating a function template with 
explicit template arguments, but not when we don't annotate anything.)



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74383 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 6cb07ef..29d1d87 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -963,7 +963,7 @@
   }
 
   if (SS.isEmpty())
-    return Tok.isNot(tok::identifier);
+    return Tok.isNot(tok::identifier) && Tok.isNot(tok::coloncolon);
   
   // A C++ scope specifier that isn't followed by a typename.
   // Push the current token back into the token stream (or revert it if it is