diff options
| author | Artem Belevich <tra@google.com> | 2018-09-21 17:46:28 +0000 |
|---|---|---|
| committer | Artem Belevich <tra@google.com> | 2018-09-21 17:46:28 +0000 |
| commit | 2eeb0489054888b580f4b0ccf54e2df34c4a91d9 (patch) | |
| tree | 7ec238ff6f09a0dee5762ab61b6a777db80a69fc /clang/lib | |
| parent | 5805def9c8ee4dbb9cce9f6696dc1c22c4b247b9 (diff) | |
| download | bcm5719-llvm-2eeb0489054888b580f4b0ccf54e2df34c4a91d9.tar.gz bcm5719-llvm-2eeb0489054888b580f4b0ccf54e2df34c4a91d9.zip | |
[CUDA] Fixed parsing of optional template-argument-list.
We need to consider all tokens that start with '>' when
we're checking for the end of an empty template argument list.
Differential Revision: https://reviews.llvm.org/D52321
llvm-svn: 342752
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Parse/ParseTemplate.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index 5af543702ca..26709a5aaa6 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -946,7 +946,9 @@ Parser::ParseTemplateIdAfterTemplateName(bool ConsumeLastToken, 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) { |
