================
@@ -327,8 +327,8 @@ bool Parser::ParseTemplateParameters(
// Try to parse the template parameter list.
bool Failed = false;
- // FIXME: Missing greatergreatergreater support.
- if (!Tok.is(tok::greater) && !Tok.is(tok::greatergreater)) {
+ if (!Tok.is(tok::greater) && !Tok.is(tok::greatergreater) &&
+ !Tok.is(tok::greatergreatergreater)) {
----------------
anondeveg wrote:
Yes, I tested this case with unresolved Git conflict markers:
`<<<<<<< HEAD`
`template <template <template <int>>> struct S;`
`=======`
`template <template <int>> typename T;`
`>>>>>>> other-branch`
With the patch, Clang reports only the expected `version control conflict
marker in file` diagnostic and does not produce any additional template-parsing
errors.
https://github.com/llvm/llvm-project/pull/219638
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
