diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c/c-parser.c | 2 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/goacc/asyncwait-1.c | 23 |
3 files changed, 17 insertions, 10 deletions
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 2a49d07..5cdeb21 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -14332,7 +14332,7 @@ c_parser_oacc_clause_async (c_parser *parser, tree list) { c_parser_consume_token (parser); - t = c_parser_expression (parser).value; + t = c_parser_expr_no_commas (parser, NULL).value; if (!INTEGRAL_TYPE_P (TREE_TYPE (t))) c_parser_error (parser, "expected integer expression"); else if (t == error_mark_node diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 92de144..378e457 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -38050,7 +38050,7 @@ cp_parser_oacc_clause_async (cp_parser *parser, tree list) matching_parens parens; parens.consume_open (parser); - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) cp_parser_skip_to_closing_parenthesis (parser, /*recovering=*/true, diff --git a/gcc/testsuite/c-c++-common/goacc/asyncwait-1.c b/gcc/testsuite/c-c++-common/goacc/asyncwait-1.c index 2f5d476..1857d65 100644 --- a/gcc/testsuite/c-c++-common/goacc/asyncwait-1.c +++ b/gcc/testsuite/c-c++-common/goacc/asyncwait-1.c @@ -9,7 +9,7 @@ f (int N, float *a, float *b) b[ii] = a[ii]; } -#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,) /* { dg-error "expected (primary-|)expression before" } */ +#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,) /* { dg-error "expected '\\)' before ',' token" } */ { for (ii = 0; ii < N; ii++) b[ii] = a[ii]; @@ -21,19 +21,19 @@ f (int N, float *a, float *b) b[ii] = a[ii]; } -#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,2,) /* { dg-error "expected (primary-|)expression before" } */ +#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,2,) /* { dg-error "expected '\\)' before ',' token" } */ { for (ii = 0; ii < N; ii++) b[ii] = a[ii]; } -#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,2 3) /* { dg-error "expected '\\)' before numeric constant" } */ +#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,2 3) /* { dg-error "expected '\\)' before ',' token" } */ { for (ii = 0; ii < N; ii++) b[ii] = a[ii]; } -#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,2,,) /* { dg-error "expected (primary-|)expression before" } */ +#pragma acc parallel copyin (a[0:N]) copy (b[0:N]) async (1,2,,) /* { dg-error "expected '\\)' before ',' token" } */ { for (ii = 0; ii < N; ii++) b[ii] = a[ii]; @@ -193,15 +193,15 @@ f (int N, float *a, float *b) #pragma acc wait async (1 2) /* { dg-error "expected '\\)' before numeric constant" } */ -#pragma acc wait async (1,) /* { dg-error "expected (primary-|)expression before" } */ +#pragma acc wait async (1,) /* { dg-error "expected '\\)' before ',' token" } */ #pragma acc wait async (,1) /* { dg-error "expected (primary-|)expression before" } */ -#pragma acc wait async (1,2,) /* { dg-error "expected (primary-|)expression before" } */ +#pragma acc wait async (1,2,) /* { dg-error "expected '\\)' before ',' token" } */ -#pragma acc wait async (1,2 3) /* { dg-error "expected '\\)' before numeric constant" } */ +#pragma acc wait async (1,2 3) /* { dg-error "expected '\\)' before ',' token" } */ -#pragma acc wait async (1,2,,) /* { dg-error "expected (primary-|)expression before" } */ +#pragma acc wait async (1,2,,) /* { dg-error "expected '\\)' before ',' token" } */ #pragma acc wait async (1 /* { dg-error "expected '\\)' before end of line" } */ @@ -215,3 +215,10 @@ f (int N, float *a, float *b) /* { dg-error "expected integer expression before" "" { target c } .-1 } */ /* { dg-error "expression must be integral" "" { target c++ } .-2 } */ } + +/* PR c/99137 */ +void f2 () +{ + #pragma acc parallel async(1,2) /* { dg-error "expected '\\)' before ',' token" } */ + ; +} |