Implement Sebastian's idea for simplifying our handling of the greater-than operator/delimiter. Also, clean up after ourselves following a failed parse of a template-argument-list

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

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index f083be5602..fa76714139 100644
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -371,13 +371,17 @@ void Parser::AnnotateTemplateIdToken(DeclTy *Template, TemplateNameKind TNK,
   TemplateArgList TemplateArgs;
   TemplateArgIsTypeList TemplateArgIsType;
   {
-    MakeGreaterThanTemplateArgumentListTerminator G(GreaterThanIsOperator);
+    GreaterThanIsOperatorScope G(GreaterThanIsOperator, false);
     if (Tok.isNot(tok::greater) && 
         ParseTemplateArgumentList(TemplateArgs, TemplateArgIsType)) {
       // Try to find the closing '>'.
       SkipUntil(tok::greater, true, true);
+
+      // Clean up any template arguments that we successfully parsed.
+      ASTTemplateArgsPtr TemplateArgsPtr(Actions, &TemplateArgs[0],
+                                         &TemplateArgIsType[0],
+                                         TemplateArgs.size());
       
-      // FIXME: What's our recovery strategy for failed template-argument-lists?
       return;
     }
   }