diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2022-07-29 09:59:19 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2022-07-29 09:59:19 +0200 |
| commit | 2dcceedb3c121f2498ae58d8414e7b8454b7bf55 (patch) | |
| tree | 4b430a47464cf74aa6b1c321a96626cff344abaf /gcc | |
| parent | 97d32048c04e9787fccadc4bae1c042754503e34 (diff) | |
| download | gcc-2dcceedb3c121f2498ae58d8414e7b8454b7bf55.zip gcc-2dcceedb3c121f2498ae58d8414e7b8454b7bf55.tar.gz gcc-2dcceedb3c121f2498ae58d8414e7b8454b7bf55.tar.bz2 | |
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 <jakub@redhat.com>
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/parser.cc | 4 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/gomp/atomic-32.c | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 4f67441..826595a 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -41535,7 +41535,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/c-c++-common/gomp/atomic-32.c b/gcc/testsuite/c-c++-common/gomp/atomic-32.c new file mode 100644 index 0000000..e39a967 --- /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)" } */ +} |