[pushed] c++: C++23 range-for temps and ?: [PR119073]

[Jason Merrill]

Tested x86_64-pc-linux-gnu, applying to trunk.

-- 8< --

Here gimplification got confused because extend_temps_r messed up the types
of the arms of a COND_EXPR.

        PR c++/119073

gcc/cp/ChangeLog:

        * call.cc (extend_temps_r): Preserve types of COND_EXPR arms.

gcc/testsuite/ChangeLog:

        * g++.dg/cpp0x/range-for39.C: New test.
---
 gcc/cp/call.cc                           |  2 +-
 gcc/testsuite/g++.dg/cpp0x/range-for39.C | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/range-for39.C

diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
index be9b0cf62f1..f7b4cccb1c7 100644
--- a/gcc/cp/call.cc
+++ b/gcc/cp/call.cc
@@ -14902,7 +14902,7 @@ extend_temps_r (tree *tp, int *walk_subtrees, void 
*data)
          {
            tree set = build2 (MODIFY_EXPR, boolean_type_node,
                               cur_cond_guard, boolean_true_node);
-           op = add_stmt_to_compound (set, op);
+           op = cp_build_compound_expr (set, op, tf_none);
          }
       };
       walk_arm (TREE_OPERAND (*tp, 1));
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for39.C 
b/gcc/testsuite/g++.dg/cpp0x/range-for39.C
new file mode 100644
index 00000000000..ebb6acafe7f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for39.C
@@ -0,0 +1,12 @@
+// PR c++/119073
+// { dg-do compile { target c++11 } }
+
+struct A { ~A (); };
+struct B { B (const A &a = A ()); int *begin (); int *end (); ~B (); };
+
+void
+foo (bool x)
+{
+  for (auto i : (x ? B{} : B{}))
+    ;
+}

base-commit: 8d7762945bba3c8321b5856cee3d5e5aed55facf
-- 
2.48.1