From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 03DD73858429; Fri, 29 Jul 2022 09:16:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03DD73858429 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-12] openmp: Reject invalid forms of C++ #pragma omp atomic compare [PR106448] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 827a29d1cc2b482609e314be29df12f926aa404a X-Git-Newrev: 70d8133b609acdf23bdec3d7adf9c437605795e5 Message-Id: <20220729091655.03DD73858429@sourceware.org> Date: Fri, 29 Jul 2022 09:16:55 +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: Fri, 29 Jul 2022 09:16:55 -0000 https://gcc.gnu.org/g:70d8133b609acdf23bdec3d7adf9c437605795e5 commit 70d8133b609acdf23bdec3d7adf9c437605795e5 Author: Jakub Jelinek Date: Fri Jul 29 11:12:03 2022 +0200 openmp: Reject invalid forms of C++ #pragma omp atomic compare [PR106448] The allowed syntaxes of atomic compare don't allow ()s around the condition of ?:, but we were accepting it in one case for C++. Fixed thusly. 2022-07-29 Jakub Jelinek PR c++/106448 * parser.cc (cp_parser_omp_atomic): For simple cast followed by CPP_QUERY token, don't try cp_parser_binary_operation if compare is true. * c-c++-common/gomp/atomic-32.c: New test. (cherry picked from commit 2dcceedb3c121f2498ae58d8414e7b8454b7bf55) Diff: --- gcc/cp/ChangeLog.omp | 10 ++++++++++ gcc/cp/parser.cc | 4 +++- gcc/testsuite/ChangeLog.omp | 8 ++++++++ gcc/testsuite/c-c++-common/gomp/atomic-32.c | 14 ++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index b856f4ae0d4..d107e6cd9e6 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,3 +1,13 @@ +2022-07-29 Tobias Burnus + + Backport from mainline: + 2022-07-29 Jakub Jelinek + + PR c++/106448 + * parser.cc (cp_parser_omp_atomic): For simple cast followed by + CPP_QUERY token, don't try cp_parser_binary_operation if compare + is true. + 2022-07-05 Tobias Burnus Backport from mainline: diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 44643cd4a09..2fd1d2b78c3 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -41554,7 +41554,9 @@ restart: goto saw_error; } token = cp_lexer_peek_token (parser->lexer); - if (token->type != CPP_SEMICOLON && !cp_tree_equal (lhs, rhs1)) + if (token->type != CPP_SEMICOLON + && (!compare || token->type != CPP_QUERY) + && !cp_tree_equal (lhs, rhs1)) { cp_parser_abort_tentative_parse (parser); cp_parser_parse_tentatively (parser); diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 2567e10231f..89b5283cdba 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-07-29 Tobias Burnus + + Backport from mainline: + 2022-07-29 Jakub Jelinek + + PR c++/106448 + * c-c++-common/gomp/atomic-32.c: New test. + 2022-07-12 Andrew Stubbs * lib/target-supports.exp diff --git a/gcc/testsuite/c-c++-common/gomp/atomic-32.c b/gcc/testsuite/c-c++-common/gomp/atomic-32.c new file mode 100644 index 00000000000..e39a96789d6 --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/atomic-32.c @@ -0,0 +1,14 @@ +/* PR c++/106448 */ + +int x, expr; + +void +foo (void) +{ + #pragma omp atomic compare + x = (expr > x) ? expr : x; /* { dg-error "invalid (form|operator)" } */ + #pragma omp atomic compare + x = (x < expr) ? expr : x; /* { dg-error "invalid (form|operator)" } */ + #pragma omp atomic compare + x = (x == expr) ? expr : x; /* { dg-error "invalid (form|operator)" } */ +}