From 2263c9f24f5d46d6033e8a0804bcfca991f85f49 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 22 Feb 2019 11:49:43 +0100 Subject: [PATCH] [C, C++] Use correct location information for OpenACC shape and simple clauses gcc/c/ * c-parser.c (c_parser_oacc_shape_clause): Add loc formal parameter. Adjust all users. (c_parser_oacc_simple_clause): Replace parser with loc formal parameter. Adjust all users. gcc/cp/ * parser.c (cp_parser_oacc_simple_clause): Remove parser formal parameter, move loc formal parameter to the front. Adjust all users. (cp_parser_oacc_shape_clause): Add loc formal parameter. Adjust all users. From-SVN: r269102 --- gcc/c/ChangeLog | 7 +++++++ gcc/c/c-parser.c | 28 ++++++++++++++-------------- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/parser.c | 45 +++++++++++++++++++++++---------------------- 4 files changed, 52 insertions(+), 36 deletions(-) diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index b76f5b1fae6..6b26ca0f9b3 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,10 @@ +2019-02-22 Thomas Schwinge + + * c-parser.c (c_parser_oacc_shape_clause): Add loc formal + parameter. Adjust all users. + (c_parser_oacc_simple_clause): Replace parser with loc formal + parameter. Adjust all users. + 2019-02-19 Chung-Lin Tang PR c/87924 diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 6c1f3076241..22c7416ac94 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -13159,12 +13159,12 @@ c_parser_oacc_single_int_clause (c_parser *parser, omp_clause_code code, */ static tree -c_parser_oacc_shape_clause (c_parser *parser, omp_clause_code kind, +c_parser_oacc_shape_clause (c_parser *parser, location_t loc, + omp_clause_code kind, const char *str, tree list) { const char *id = "num"; tree ops[2] = { NULL_TREE, NULL_TREE }, c; - location_t loc = c_parser_peek_token (parser)->location; if (kind == OMP_CLAUSE_VECTOR) id = "length"; @@ -13296,12 +13296,12 @@ c_parser_oacc_shape_clause (c_parser *parser, omp_clause_code kind, seq */ static tree -c_parser_oacc_simple_clause (c_parser *parser, enum omp_clause_code code, +c_parser_oacc_simple_clause (location_t loc, enum omp_clause_code code, tree list) { check_no_duplicate_clause (list, code, omp_clause_code_name[code]); - tree c = build_omp_clause (c_parser_peek_token (parser)->location, code); + tree c = build_omp_clause (loc, code); OMP_CLAUSE_CHAIN (c) = list; return c; @@ -14807,8 +14807,8 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, c_name = "async"; break; case PRAGMA_OACC_CLAUSE_AUTO: - clauses = c_parser_oacc_simple_clause (parser, OMP_CLAUSE_AUTO, - clauses); + clauses = c_parser_oacc_simple_clause (here, OMP_CLAUSE_AUTO, + clauses); c_name = "auto"; break; case PRAGMA_OACC_CLAUSE_COLLAPSE: @@ -14852,7 +14852,7 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, c_name = "device_resident"; break; case PRAGMA_OACC_CLAUSE_FINALIZE: - clauses = c_parser_oacc_simple_clause (parser, OMP_CLAUSE_FINALIZE, + clauses = c_parser_oacc_simple_clause (here, OMP_CLAUSE_FINALIZE, clauses); c_name = "finalize"; break; @@ -14862,7 +14862,7 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, break; case PRAGMA_OACC_CLAUSE_GANG: c_name = "gang"; - clauses = c_parser_oacc_shape_clause (parser, OMP_CLAUSE_GANG, + clauses = c_parser_oacc_shape_clause (parser, here, OMP_CLAUSE_GANG, c_name, clauses); break; case PRAGMA_OACC_CLAUSE_HOST: @@ -14874,13 +14874,13 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, c_name = "if"; break; case PRAGMA_OACC_CLAUSE_IF_PRESENT: - clauses = c_parser_oacc_simple_clause (parser, OMP_CLAUSE_IF_PRESENT, + clauses = c_parser_oacc_simple_clause (here, OMP_CLAUSE_IF_PRESENT, clauses); c_name = "if_present"; break; case PRAGMA_OACC_CLAUSE_INDEPENDENT: - clauses = c_parser_oacc_simple_clause (parser, OMP_CLAUSE_INDEPENDENT, - clauses); + clauses = c_parser_oacc_simple_clause (here, OMP_CLAUSE_INDEPENDENT, + clauses); c_name = "independent"; break; case PRAGMA_OACC_CLAUSE_LINK: @@ -14914,7 +14914,7 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, c_name = "reduction"; break; case PRAGMA_OACC_CLAUSE_SEQ: - clauses = c_parser_oacc_simple_clause (parser, OMP_CLAUSE_SEQ, + clauses = c_parser_oacc_simple_clause (here, OMP_CLAUSE_SEQ, clauses); c_name = "seq"; break; @@ -14928,7 +14928,7 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, break; case PRAGMA_OACC_CLAUSE_VECTOR: c_name = "vector"; - clauses = c_parser_oacc_shape_clause (parser, OMP_CLAUSE_VECTOR, + clauses = c_parser_oacc_shape_clause (parser, here, OMP_CLAUSE_VECTOR, c_name, clauses); break; case PRAGMA_OACC_CLAUSE_VECTOR_LENGTH: @@ -14943,7 +14943,7 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, break; case PRAGMA_OACC_CLAUSE_WORKER: c_name = "worker"; - clauses = c_parser_oacc_shape_clause (parser, OMP_CLAUSE_WORKER, + clauses = c_parser_oacc_shape_clause (parser, here, OMP_CLAUSE_WORKER, c_name, clauses); break; default: diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e7780e7eb12..0858646d19e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2019-02-22 Thomas Schwinge + + * parser.c (cp_parser_oacc_simple_clause): Remove parser formal + parameter, move loc formal parameter to the front. Adjust all + users. + (cp_parser_oacc_shape_clause): Add loc formal parameter. Adjust + all users. + 2019-02-21 Jason Merrill PR c++/87685 - generic lambda 'this' capture error. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f8d44e06ec3..545047c91af 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -32595,13 +32595,14 @@ cp_parser_oacc_data_clause_deviceptr (cp_parser *parser, tree list) seq */ static tree -cp_parser_oacc_simple_clause (cp_parser * /* parser */, - enum omp_clause_code code, - tree list, location_t location) +cp_parser_oacc_simple_clause (location_t loc, enum omp_clause_code code, + tree list) { - check_no_duplicate_clause (list, code, omp_clause_code_name[code], location); - tree c = build_omp_clause (location, code); + check_no_duplicate_clause (list, code, omp_clause_code_name[code], loc); + + tree c = build_omp_clause (loc, code); OMP_CLAUSE_CHAIN (c) = list; + return c; } @@ -32657,13 +32658,13 @@ cp_parser_oacc_single_int_clause (cp_parser *parser, omp_clause_code code, */ static tree -cp_parser_oacc_shape_clause (cp_parser *parser, omp_clause_code kind, +cp_parser_oacc_shape_clause (cp_parser *parser, location_t loc, + omp_clause_code kind, const char *str, tree list) { const char *id = "num"; cp_lexer *lexer = parser->lexer; tree ops[2] = { NULL_TREE, NULL_TREE }, c; - location_t loc = cp_lexer_peek_token (lexer)->location; if (kind == OMP_CLAUSE_VECTOR) id = "length"; @@ -34884,8 +34885,8 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, c_name = "async"; break; case PRAGMA_OACC_CLAUSE_AUTO: - clauses = cp_parser_oacc_simple_clause (parser, OMP_CLAUSE_AUTO, - clauses, here); + clauses = cp_parser_oacc_simple_clause (here, OMP_CLAUSE_AUTO, + clauses); c_name = "auto"; break; case PRAGMA_OACC_CLAUSE_COLLAPSE: @@ -34929,8 +34930,8 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, c_name = "device_resident"; break; case PRAGMA_OACC_CLAUSE_FINALIZE: - clauses = cp_parser_oacc_simple_clause (parser, OMP_CLAUSE_FINALIZE, - clauses, here); + clauses = cp_parser_oacc_simple_clause (here, OMP_CLAUSE_FINALIZE, + clauses); c_name = "finalize"; break; case PRAGMA_OACC_CLAUSE_FIRSTPRIVATE: @@ -34940,7 +34941,7 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, break; case PRAGMA_OACC_CLAUSE_GANG: c_name = "gang"; - clauses = cp_parser_oacc_shape_clause (parser, OMP_CLAUSE_GANG, + clauses = cp_parser_oacc_shape_clause (parser, here, OMP_CLAUSE_GANG, c_name, clauses); break; case PRAGMA_OACC_CLAUSE_HOST: @@ -34952,15 +34953,13 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, c_name = "if"; break; case PRAGMA_OACC_CLAUSE_IF_PRESENT: - clauses = cp_parser_oacc_simple_clause (parser, - OMP_CLAUSE_IF_PRESENT, - clauses, here); + clauses = cp_parser_oacc_simple_clause (here, OMP_CLAUSE_IF_PRESENT, + clauses); c_name = "if_present"; break; case PRAGMA_OACC_CLAUSE_INDEPENDENT: - clauses = cp_parser_oacc_simple_clause (parser, - OMP_CLAUSE_INDEPENDENT, - clauses, here); + clauses = cp_parser_oacc_simple_clause (here, OMP_CLAUSE_INDEPENDENT, + clauses); c_name = "independent"; break; case PRAGMA_OACC_CLAUSE_LINK: @@ -34995,8 +34994,8 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, c_name = "reduction"; break; case PRAGMA_OACC_CLAUSE_SEQ: - clauses = cp_parser_oacc_simple_clause (parser, OMP_CLAUSE_SEQ, - clauses, here); + clauses = cp_parser_oacc_simple_clause (here, OMP_CLAUSE_SEQ, + clauses); c_name = "seq"; break; case PRAGMA_OACC_CLAUSE_TILE: @@ -35010,7 +35009,8 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, break; case PRAGMA_OACC_CLAUSE_VECTOR: c_name = "vector"; - clauses = cp_parser_oacc_shape_clause (parser, OMP_CLAUSE_VECTOR, + clauses = cp_parser_oacc_shape_clause (parser, here, + OMP_CLAUSE_VECTOR, c_name, clauses); break; case PRAGMA_OACC_CLAUSE_VECTOR_LENGTH: @@ -35025,7 +35025,8 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask, break; case PRAGMA_OACC_CLAUSE_WORKER: c_name = "worker"; - clauses = cp_parser_oacc_shape_clause (parser, OMP_CLAUSE_WORKER, + clauses = cp_parser_oacc_shape_clause (parser, here, + OMP_CLAUSE_WORKER, c_name, clauses); break; default: -- 2.30.2