[CUDA] Fixed parsing of optional template-argument-list.

[rsmith]

clang/lib/Parse/ParseTemplate.cpp

949–950 ↗

(On Diff #166350)

It'd be good to include the other tokens that start with > here (which we also split as an extension): tok::greaterequal and tok::greatergreaterequal.

[tra]

Added '>=' and '>>=' to the list of tokens that may indicate the end of the
empty template argument list.

lib/Parse/ParseTemplate.cpp

Parser::ParseTemplateIdAfterTemplateName(bool ConsumeLastToken,
 
   // Consume the '<'.
   LAngleLoc = ConsumeToken();
 
   // Parse the optional template-argument-list.
   bool Invalid = false;
   {
     GreaterThanIsOperatorScope G(GreaterThanIsOperator, false);
-    if (Tok.isNot(tok::greater) && Tok.isNot(tok::greatergreater))
+    if (!Tok.isOneOf(tok::greater, tok::greatergreater,
+                     tok::greatergreatergreater, tok::greaterequal,
+                     tok::greatergreaterequal))
       Invalid = ParseTemplateArgumentList(TemplateArgs);
 
     if (Invalid) {
       // Try to find the closing '>'.
       if (ConsumeLastToken)
         SkipUntil(tok::greater, StopAtSemi);
       else
         SkipUntil(tok::greater, StopAtSemi | StopBeforeMatch);

test/Parser/cuda-kernel-call-c++11.cu

 // RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify %s
 
-template<typename> struct S {};
+template<typename T=int> struct S {};
 template<typename> void f();
 
 
 void foo(void) {
   // In C++11 mode, all of these are expected to parse correctly, and the CUDA
   // language should not interfere with that.
 
   // expected-no-diagnostics
 
   S<S<S<int>>> s3;
+  S<S<S<>>> s30;
 
   S<S<S<S<int>>>> s4;
+  S<S<S<S<>>>> s40;
 
   S<S<S<S<S<int>>>>> s5;
+  S<S<S<S<S<>>>>> s50;
 
   (void)(&f<S<S<int>>>==0);
+  (void)(&f<S<S<>>>==0);
 }

test/Parser/cuda-kernel-call.cu

 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
-template<typename> struct S {};
+template<typename T=int> struct S {};
 template<typename> void f();
 
 void foo(void) {
   foo<<<1;      // expected-error {{expected '>>>'}} expected-note {{to match this '<<<'}}
 
   foo<<<1,1>>>; // expected-error {{expected '('}}
 
   foo<<<>>>();  // expected-error {{expected expression}}
 
   // The following two are parse errors because -std=c++11 is not enabled.
 
   S<S<S<int>>> s; // expected-error 2{{use '> >'}}
+  S<S<S<>>> s1; // expected-error 2{{use '> >'}}
   (void)(&f<S<S<int>>>==0); // expected-error 2{{use '> >'}}
+  (void)(&f<S<S<>>>==0); // expected-error 2{{use '> >'}}
 }