* [C++ PATCH] PR c++/54430
@ 2015-10-01 18:06 Ville Voutilainen
2015-10-01 19:03 ` Jason Merrill
0 siblings, 1 reply; 2+ messages in thread
From: Ville Voutilainen @ 2015-10-01 18:06 UTC (permalink / raw)
To: gcc-patches, Jason Merrill
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
Tested on Linux-PPC64.
/cp
2015-10-01 Ville Voutilainen <ville.voutilainen@gmail.com>
PR c++/54430
* name-lookup.c (push_binding): Make non-static.
* name-lookup.h (push_binding): Declare it.
* parser.c (cp_parser_range_for): Use it, get the range
declaration away from the scope until the range expression
has been parsed, then restore the declaration.
/testsuite
2015-10-01 Ville Voutilainen <ville.voutilainen@gmail.com>
PR c++/54430
* g++.dg/cpp0x/range-for30.C: New.
[-- Attachment #2: pr54430.diff --]
[-- Type: text/plain, Size: 2548 bytes --]
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index baaf3e7..bd052a4 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -332,7 +332,7 @@ new_class_binding (tree name, tree value, tree type, cp_binding_level *scope)
/* Make DECL the innermost binding for ID. The LEVEL is the binding
level at which this declaration is being bound. */
-static void
+void
push_binding (tree id, tree decl, cp_binding_level* level)
{
cxx_binding *binding;
diff --git a/gcc/cp/name-lookup.h b/gcc/cp/name-lookup.h
index 4b94192..82b5e53 100644
--- a/gcc/cp/name-lookup.h
+++ b/gcc/cp/name-lookup.h
@@ -88,6 +88,7 @@ struct GTY(()) cxx_saved_binding {
extern tree identifier_type_value (tree);
extern void set_identifier_type_value (tree, tree);
+extern void push_binding (tree, tree, cp_binding_level*);
extern void pop_binding (tree, tree);
extern void pop_bindings_and_leave_scope (void);
extern tree constructor_name (tree);
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 1148156..8aeca40 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10725,6 +10725,11 @@ cp_parser_range_for (cp_parser *parser, tree scope, tree init, tree range_decl,
{
tree stmt, range_expr;
+ /* Get the range declaration momentarily out of the way so that
+ the range expression doesn't clash with it. */
+ if (range_decl != error_mark_node)
+ pop_binding (DECL_NAME (range_decl), range_decl);
+
if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
{
bool expr_non_constant_p;
@@ -10733,6 +10738,10 @@ cp_parser_range_for (cp_parser *parser, tree scope, tree init, tree range_decl,
else
range_expr = cp_parser_expression (parser);
+ /* Put the range declaration back into scope. */
+ if (range_decl != error_mark_node)
+ push_binding (DECL_NAME (range_decl), range_decl, current_binding_level);
+
/* If in template, STMT is converted to a normal for-statement
at instantiation. If not, it is done just ahead. */
if (processing_template_decl)
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for30.C b/gcc/testsuite/g++.dg/cpp0x/range-for30.C
new file mode 100644
index 0000000..d559d0f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for30.C
@@ -0,0 +1,17 @@
+// PR c++/54430
+// { dg-require-effective-target c++11 }
+
+struct A
+{
+ A(int) {}
+ int* begin() {return nullptr;}
+ int* end() {return nullptr;}
+};
+
+int main()
+{
+ int i[] = { 1, 2, 3, 4 };
+ for (int i : i);
+ for (auto i : i);
+ for (A v : v); // { dg-error "not declared in this scope" }
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [C++ PATCH] PR c++/54430
2015-10-01 18:06 [C++ PATCH] PR c++/54430 Ville Voutilainen
@ 2015-10-01 19:03 ` Jason Merrill
0 siblings, 0 replies; 2+ messages in thread
From: Jason Merrill @ 2015-10-01 19:03 UTC (permalink / raw)
To: Ville Voutilainen, gcc-patches
OK.
Jason
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-01 19:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-01 18:06 [C++ PATCH] PR c++/54430 Ville Voutilainen
2015-10-01 19:03 ` Jason Merrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).