Since my PR94041 work on temporary lifetime in aggregate initialization, we
end up calling build_vec_init to initialize the reference-extended temporary
for the artificial __for_range variable. And build_vec_init uses
finish_for_stmt to implement its loop. That function assumes that if
__for_range is in current_binding_level, we're finishing a range-for, and we
should fix up the variable as it goes out of scope. But when called from
build_vec_init we aren't finishing a range-for, and do_poplevel doesn't
remove the variable from scope because stmts_are_full_exprs_p is false. So
let's check that here as well, and leave the DECL_NAME alone.
Tested x86_64-pc-linux-gnu, applying to trunk.
PR c++/106230
gcc/cp/ChangeLog:
* semantics.cc (finish_for_stmt): Check stmts_are_full_exprs_p.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/range-for38.C: New test.
---
gcc/cp/semantics.cc | 5 +++++
gcc/testsuite/g++.dg/cpp0x/range-for38.C | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/range-for38.C
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 96037c21b85..16dea0593b0 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -1411,6 +1411,11 @@ finish_for_stmt (tree for_stmt)
add_stmt (do_poplevel (scope));
+ /* If we're being called from build_vec_init, don't mess with the names of
+ the variables for an enclosing range-for. */
+ if (!stmts_are_full_exprs_p ())
+ return;
+
for (int i = 0; i < 3; i++)
if (range_for_decl[i])
DECL_NAME (range_for_decl[i])
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for38.C
b/gcc/testsuite/g++.dg/cpp0x/range-for38.C
new file mode 100644
index 00000000000..39845b937c1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for38.C
@@ -0,0 +1,16 @@
+// PR c++/106230
+// { dg-do compile { target c++11 } }
+
+struct A {
+ A();
+ operator int();
+};
+template <int N> struct array {
+ A elts[N];
+ A *begin();
+ A *end();
+};
+void fn() {
+ for (int i : array<4>{})
+ ;
+}
base-commit: 4c6567b4090d9363f90b5c68e238e7d0964b6e89
--
2.31.1
