From 213f5e8accc3e6dad179eafd48c920e524b56be2 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 25 Jul 2018 18:46:34 +0200 Subject: [PATCH] re PR c++/85515 (Bogus suggestions from "GCC's leaky abstractions") PR c++/85515 * cp-tree.h (enum cp_tree_index): Add CPTI_FOR_{RANGE,BEGIN,END}{,_}_IDENTIFIER. (for_range__identifier, for_begin__identifier, for_end__identifier, for_range_identifier, for_begin_identifier, for_end_identifier): Define. * decl.c (initialize_predefined_identifiers): Initialize for_{range,begin,end}{,_}_identifier. * parser.c (build_range_temp): Use for_range__identifier instead of get_identifier ("__for_range"). (cp_convert_range_for): Use for_begin__identifier and for_end__identifier instead of get_identifier ("__for_begin") and get_identifier ("__for_end"). * semantics.c (finish_for_stmt): Rename "__for_{range,begin,end} " local symbols to "__for_{range,begin,end}". * g++.dg/pr85515-2.C: Add expected dg-error. * g++.dg/cpp0x/range-for36.C: New test. From-SVN: r262975 --- gcc/cp/ChangeLog | 18 +++++++++++++ gcc/cp/cp-tree.h | 12 +++++++++ gcc/cp/decl.c | 6 +++++ gcc/cp/parser.c | 11 ++++---- gcc/cp/semantics.c | 28 +++++++++++++++++++++ gcc/testsuite/ChangeLog | 6 +++++ gcc/testsuite/g++.dg/cpp0x/range-for36.C | 32 ++++++++++++++++++++++++ gcc/testsuite/g++.dg/pr85515-2.C | 3 +-- 8 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/range-for36.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f1185c4f03d..51de7d15b2f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,21 @@ +2018-07-25 Jakub Jelinek + + PR c++/85515 + * cp-tree.h (enum cp_tree_index): Add + CPTI_FOR_{RANGE,BEGIN,END}{,_}_IDENTIFIER. + (for_range__identifier, for_begin__identifier, for_end__identifier, + for_range_identifier, for_begin_identifier, for_end_identifier): + Define. + * decl.c (initialize_predefined_identifiers): Initialize + for_{range,begin,end}{,_}_identifier. + * parser.c (build_range_temp): Use for_range__identifier instead of + get_identifier ("__for_range"). + (cp_convert_range_for): Use for_begin__identifier and + for_end__identifier instead of get_identifier ("__for_begin") and + get_identifier ("__for_end"). + * semantics.c (finish_for_stmt): Rename "__for_{range,begin,end} " + local symbols to "__for_{range,begin,end}". + 2018-07-23 Jakub Jelinek PR c++/86569 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 0fac7e9892f..d4b1fa1f0e1 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -154,6 +154,12 @@ enum cp_tree_index CPTI_AUTO_IDENTIFIER, CPTI_DECLTYPE_AUTO_IDENTIFIER, CPTI_INIT_LIST_IDENTIFIER, + CPTI_FOR_RANGE__IDENTIFIER, + CPTI_FOR_BEGIN__IDENTIFIER, + CPTI_FOR_END__IDENTIFIER, + CPTI_FOR_RANGE_IDENTIFIER, + CPTI_FOR_BEGIN_IDENTIFIER, + CPTI_FOR_END_IDENTIFIER, CPTI_LANG_NAME_C, CPTI_LANG_NAME_CPLUSPLUS, @@ -274,6 +280,12 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX]; #define auto_identifier cp_global_trees[CPTI_AUTO_IDENTIFIER] #define decltype_auto_identifier cp_global_trees[CPTI_DECLTYPE_AUTO_IDENTIFIER] #define init_list_identifier cp_global_trees[CPTI_INIT_LIST_IDENTIFIER] +#define for_range__identifier cp_global_trees[CPTI_FOR_RANGE__IDENTIFIER] +#define for_begin__identifier cp_global_trees[CPTI_FOR_BEGIN__IDENTIFIER] +#define for_end__identifier cp_global_trees[CPTI_FOR_END__IDENTIFIER] +#define for_range_identifier cp_global_trees[CPTI_FOR_RANGE_IDENTIFIER] +#define for_begin_identifier cp_global_trees[CPTI_FOR_BEGIN_IDENTIFIER] +#define for_end_identifier cp_global_trees[CPTI_FOR_END_IDENTIFIER] #define lang_name_c cp_global_trees[CPTI_LANG_NAME_C] #define lang_name_cplusplus cp_global_trees[CPTI_LANG_NAME_CPLUSPLUS] diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3c1e2ef3698..29d9ba78a21 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4044,6 +4044,12 @@ initialize_predefined_identifiers (void) {"auto", &auto_identifier, cik_normal}, {"decltype(auto)", &decltype_auto_identifier, cik_normal}, {"initializer_list", &init_list_identifier, cik_normal}, + {"__for_range ", &for_range__identifier, cik_normal}, + {"__for_begin ", &for_begin__identifier, cik_normal}, + {"__for_end ", &for_end__identifier, cik_normal}, + {"__for_range", &for_range_identifier, cik_normal}, + {"__for_begin", &for_begin_identifier, cik_normal}, + {"__for_end", &for_end_identifier, cik_normal}, {NULL, NULL, cik_normal} }; diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 90d5d007317..3344ef37dec 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -11952,8 +11952,8 @@ build_range_temp (tree range_expr) type_uses_auto (range_type)); /* Create the __range variable. */ - range_temp = build_decl (input_location, VAR_DECL, - get_identifier ("__for_range"), range_type); + range_temp = build_decl (input_location, VAR_DECL, for_range__identifier, + range_type); TREE_USED (range_temp) = 1; DECL_ARTIFICIAL (range_temp) = 1; @@ -12060,8 +12060,8 @@ cp_convert_range_for (tree statement, tree range_decl, tree range_expr, } /* The new for initialization statement. */ - begin = build_decl (input_location, VAR_DECL, - get_identifier ("__for_begin"), iter_type); + begin = build_decl (input_location, VAR_DECL, for_begin__identifier, + iter_type); TREE_USED (begin) = 1; DECL_ARTIFICIAL (begin) = 1; pushdecl (begin); @@ -12071,8 +12071,7 @@ cp_convert_range_for (tree statement, tree range_decl, tree range_expr, if (cxx_dialect >= cxx17) iter_type = cv_unqualified (TREE_TYPE (end_expr)); - end = build_decl (input_location, VAR_DECL, - get_identifier ("__for_end"), iter_type); + end = build_decl (input_location, VAR_DECL, for_end__identifier, iter_type); TREE_USED (end) = 1; DECL_ARTIFICIAL (end) = 1; pushdecl (end); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index ef73d07161f..bfdca5024d3 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1060,7 +1060,35 @@ finish_for_stmt (tree for_stmt) : &FOR_SCOPE (for_stmt)); tree scope = *scope_ptr; *scope_ptr = NULL; + + /* During parsing of the body, range for uses "__for_{range,begin,end} " + decl names to make those unaccessible by code in the body. + Change it to ones with underscore instead of space, so that it can + be inspected in the debugger. */ + tree range_for_decl[3] = { NULL_TREE, NULL_TREE, NULL_TREE }; + gcc_assert (CPTI_FOR_BEGIN__IDENTIFIER == CPTI_FOR_RANGE__IDENTIFIER + 1 + && CPTI_FOR_END__IDENTIFIER == CPTI_FOR_RANGE__IDENTIFIER + 2 + && CPTI_FOR_RANGE_IDENTIFIER == CPTI_FOR_RANGE__IDENTIFIER + 3 + && CPTI_FOR_BEGIN_IDENTIFIER == CPTI_FOR_BEGIN__IDENTIFIER + 3 + && CPTI_FOR_END_IDENTIFIER == CPTI_FOR_END__IDENTIFIER + 3); + for (int i = 0; i < 3; i++) + { + tree id = cp_global_trees[CPTI_FOR_RANGE__IDENTIFIER + i]; + if (IDENTIFIER_BINDING (id) + && IDENTIFIER_BINDING (id)->scope == current_binding_level) + { + range_for_decl[i] = IDENTIFIER_BINDING (id)->value; + gcc_assert (VAR_P (range_for_decl[i]) + && DECL_ARTIFICIAL (range_for_decl[i])); + } + } + add_stmt (do_poplevel (scope)); + + for (int i = 0; i < 3; i++) + if (range_for_decl[i]) + DECL_NAME (range_for_decl[i]) + = cp_global_trees[CPTI_FOR_RANGE_IDENTIFIER + i]; } /* Begin a range-for-statement. Returns a new RANGE_FOR_STMT. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 76f935a48ad..16027a791a2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-07-25 Jakub Jelinek + + PR c++/85515 + * g++.dg/pr85515-2.C: Add expected dg-error. + * g++.dg/cpp0x/range-for36.C: New test. + 2018-07-25 Claudiu Zissulescu * gcc.target/arc/uncached-1.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for36.C b/gcc/testsuite/g++.dg/cpp0x/range-for36.C new file mode 100644 index 00000000000..fdf7f7b27ae --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/range-for36.C @@ -0,0 +1,32 @@ +// PR c++/85515 +// { dg-do compile { target c++11 } } + +int a[10]; + +void +foo () +{ + for (auto &i : a) + if (i != *__for_begin // { dg-error "was not declared in this scope" } + || &i == __for_end // { dg-error "was not declared in this scope" } + || &__for_range[0] != &a[0]) // { dg-error "was not declared in this scope" } + __builtin_abort (); +} + +template +void +bar () +{ + for (auto &i : a) + if (i != *__for_begin // { dg-error "was not declared in this scope" } + || &i == __for_end // { dg-error "was not declared in this scope" } + || &__for_range[0] != &a[0]) // { dg-error "was not declared in this scope" } + __builtin_abort (); +} + +void +baz () +{ + foo (); + bar <0> (); +} diff --git a/gcc/testsuite/g++.dg/pr85515-2.C b/gcc/testsuite/g++.dg/pr85515-2.C index 621ddb87636..2b761bf9b92 100644 --- a/gcc/testsuite/g++.dg/pr85515-2.C +++ b/gcc/testsuite/g++.dg/pr85515-2.C @@ -15,8 +15,7 @@ int test_2 () int sum = 0; for (const auto v: arr) { sum += v; - // TODO: should we issue an error for the following assignment? - __for_begin = __for_end; + __for_begin = __for_end; // { dg-error "was not declared in this scope" } } return sum; } -- 2.30.2