From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id C3BFC39AF4F7; Thu, 19 Aug 2021 10:11:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3BFC39AF4F7 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] openmp: Fix ICE on requires clause with atomic_default_mem_order ( X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: 23fcc7b6460a2698e1831ecd87e274bbc4e67e03 X-Git-Newrev: 3fbe12e6a8f886301a397ea926e3fc5f1697cea7 Message-Id: <20210819101106.C3BFC39AF4F7@sourceware.org> Date: Thu, 19 Aug 2021 10:11:06 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2021 10:11:06 -0000 https://gcc.gnu.org/g:3fbe12e6a8f886301a397ea926e3fc5f1697cea7 commit 3fbe12e6a8f886301a397ea926e3fc5f1697cea7 Author: Jakub Jelinek Date: Thu Aug 19 12:05:45 2021 +0200 openmp: Fix ICE on requires clause with atomic_default_mem_order ( When working on error directive, I've noticed the C FE ICEs on #pragma omp requires atomic_default_mem_order ( where it tries to peek 2nd token after the CPP_PRAGMA_EOL (or CPP_EOF) in there in order to improve error-recovery on say atomic_default_mem_order (acquire) or atomic_default_mem_order (seqcst) etc. The C++ FE didn't ICE, but it is better to follow the same thing there. 2021-08-19 Jakub Jelinek gcc/c/ * c-parser.c (c_parser_omp_requires): Don't call c_parser_peek_2nd_token and optionally consume token if current token is CPP_EOF, CPP_PRAGMA_EOL or CPP_CLOSE_PAREN. gcc/cp/ * parser.c (cp_parser_omp_requires): Don't call cp_lexer_nth_token_is and optionally consume token if current token is CPP_EOF, CPP_PRAGMA_EOL or CPP_CLOSE_PAREN. gcc/testsuite/ * c-c++-common/gomp/requires-3.c: Add testcase for atomic_default_mem_order ( at the end of line without corresponding ). (cherry picked from commit c04d766942274da89b236c4cb7e954b26da397c7) Diff: --- gcc/c/ChangeLog.omp | 10 ++++++++++ gcc/c/c-parser.c | 15 ++++++++++++--- gcc/cp/ChangeLog.omp | 9 +++++++++ gcc/cp/parser.c | 15 ++++++++++++--- gcc/testsuite/ChangeLog.omp | 8 ++++++++ gcc/testsuite/c-c++-common/gomp/requires-3.c | 2 ++ 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp index 80d1d59cd2a..f9aab5b5434 100644 --- a/gcc/c/ChangeLog.omp +++ b/gcc/c/ChangeLog.omp @@ -1,7 +1,17 @@ +2021-08-19 Tobias Burnus + + Backported from master: + 2021-08-19 Jakub Jelinek + + * c-parser.c (c_parser_omp_requires): Don't call + c_parser_peek_2nd_token and optionally consume token if current + token is CPP_EOF, CPP_PRAGMA_EOL or CPP_CLOSE_PAREN. + 2021-08-18 Tobias Burnus Backported from master: 2021-08-18 Jakub Jelinek + * c-parser.c (c_parser_omp_nothing): New function. (c_parser_pragma): Handle PRAGMA_OMP_NOTHING. diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 73d54f1f3ea..94539225327 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -21731,9 +21731,18 @@ c_parser_omp_requires (c_parser *parser) error_at (c_parser_peek_token (parser)->location, "expected %, % or " "%"); - if (c_parser_peek_2nd_token (parser)->type - == CPP_CLOSE_PAREN) - c_parser_consume_token (parser); + switch (c_parser_peek_token (parser)->type) + { + case CPP_EOF: + case CPP_PRAGMA_EOL: + case CPP_CLOSE_PAREN: + break; + default: + if (c_parser_peek_2nd_token (parser)->type + == CPP_CLOSE_PAREN) + c_parser_consume_token (parser); + break; + } } else c_parser_consume_token (parser); diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index c58f82443df..2dc4c7411a7 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,3 +1,12 @@ +2021-08-19 Tobias Burnus + + Backported from master: + 2021-08-19 Jakub Jelinek + + * parser.c (cp_parser_omp_requires): Don't call cp_lexer_nth_token_is + and optionally consume token if current token is CPP_EOF, + CPP_PRAGMA_EOL or CPP_CLOSE_PAREN. + 2021-08-19 Tobias Burnus Backported from master: diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c3274a265bd..cfe58f672de 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -45268,9 +45268,18 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok) error_at (cp_lexer_peek_token (parser->lexer)->location, "expected %, % or " "%"); - if (cp_lexer_nth_token_is (parser->lexer, 2, - CPP_CLOSE_PAREN)) - cp_lexer_consume_token (parser->lexer); + switch (cp_lexer_peek_token (parser->lexer)->type) + { + case CPP_EOF: + case CPP_PRAGMA_EOL: + case CPP_CLOSE_PAREN: + break; + default: + if (cp_lexer_nth_token_is (parser->lexer, 2, + CPP_CLOSE_PAREN)) + cp_lexer_consume_token (parser->lexer); + break; + } } else cp_lexer_consume_token (parser->lexer); diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index d64dae15792..c9cef896b61 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,11 @@ +2021-08-19 Tobias Burnus + + Backported from master: + 2021-08-19 Jakub Jelinek + + * c-c++-common/gomp/requires-3.c: Add testcase for + atomic_default_mem_order ( at the end of line without corresponding ). + 2021-08-19 Tobias Burnus Backported from master: diff --git a/gcc/testsuite/c-c++-common/gomp/requires-3.c b/gcc/testsuite/c-c++-common/gomp/requires-3.c index e5a6cbbdd2a..0e55b666ebf 100644 --- a/gcc/testsuite/c-c++-common/gomp/requires-3.c +++ b/gcc/testsuite/c-c++-common/gomp/requires-3.c @@ -1,3 +1,5 @@ #pragma omp requires atomic_default_mem_order(acquire) /* { dg-error "expected 'seq_cst', 'relaxed' or 'acq_rel'" } */ #pragma omp requires atomic_default_mem_order(release) /* { dg-error "expected 'seq_cst', 'relaxed' or 'acq_rel'" } */ #pragma omp requires atomic_default_mem_order(foobar) /* { dg-error "expected 'seq_cst', 'relaxed' or 'acq_rel'" } */ +#pragma omp requires atomic_default_mem_order ( /* { dg-error "expected 'seq_cst', 'relaxed' or 'acq_rel'" } */ +/* { dg-error "expected '\\\)' before end of line" "" { target *-*-* } .-1 } */