commit c8e27cc402043ec86c1698c09e4ee9e415b16207
author Chris Lattner <sabre@nondot.org> Fri Jun 26 04:27:47 2009 +0000
committer Chris Lattner <sabre@nondot.org> Fri Jun 26 04:27:47 2009 +0000
tree 678dcdb449fbdfde7f785102db47b89a988bc914
parent b76c2322bf5b6d4ff151dcc3c5d2080e1834c4c5

fix PR4452, a crash on invalid.  The error recovery is still terrible in this case
but at least we don't crash :)


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

lib/Parse/ParseExprCXX.cpp

diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 68964e9..d89f1e1 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -85,8 +85,10 @@
         = Actions.ActOnDependentTemplateName(TemplateKWLoc,
                                              *Tok.getIdentifierInfo(),
                                              Tok.getLocation(), SS);
-      AnnotateTemplateIdToken(Template, TNK_Dependent_template_name,
-                              &SS, TemplateKWLoc, false);
+      if (AnnotateTemplateIdToken(Template, TNK_Dependent_template_name,
+                                  &SS, TemplateKWLoc, false))
+        break;
+      
       continue;
     }
     
@@ -179,7 +181,9 @@
         // because some clients (e.g., the parsing of class template
         // specializations) still want to see the original template-id
         // token.
-        AnnotateTemplateIdToken(Template, TNK, &SS, SourceLocation(), false);
+        if (AnnotateTemplateIdToken(Template, TNK, &SS, SourceLocation(),
+                                    false))
+          break;
         continue;
       }
     }