typeck.c (build_compound_expr): If RHS is a TARGET_EXPR, put the compound expr inside...

cp:
	* typeck.c (build_compound_expr): If RHS is a TARGET_EXPR, put the
	compound expr inside the target's initializer.
testsuite:
	* g++.dg/opt/tmp1.C: New test.

From-SVN: r70042

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1bc4fed5a5a73dd09be3d10ac3dbac3089e02b7c..d999173926d8af23ff09a5364fc6d841130a4bb4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-01  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * typeck.c (build_compound_expr): If RHS is a TARGET_EXPR, put the
+       compound expr inside the target's initializer.
+       
        PR c++/11525
        * parser.c (cp_parser_primary_expression): Do not set
        non-constant-p merely because it is a dependent scope.

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 00fa013b69a0e34d6a3f8ceddcc69dd655e6d7fc..dd7e0af8084bd827d722894b5cfcdb3220296eea 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4322,6 +4322,19 @@ build_compound_expr (tree lhs, tree rhs)
   lhs = convert_to_void (lhs, "left-hand operand of comma");
   if (lhs == error_mark_node || rhs == error_mark_node)
     return error_mark_node;
+
+  if (TREE_CODE (rhs) == TARGET_EXPR)
+    {
+      /* If the rhs is a TARGET_EXPR, then build the compound
+         expression inside the target_expr's initializer. This
+        helps the compiler to eliminate unncessary temporaries.  */
+      tree init = TREE_OPERAND (rhs, 1);
+
+      init = build (COMPOUND_EXPR, TREE_TYPE (init), lhs, init);
+      TREE_OPERAND (rhs, 1) = init;
+      
+      return rhs;
+    }
   
   return build (COMPOUND_EXPR, TREE_TYPE (rhs), lhs, rhs);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f78f24ecb7de0144186515c9301f7e506cdbe2b3..eb64af8c6c805e633c4d4d0e1f4cb5fd88afe4de 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2003-08-01  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * g++.dg/opt/tmp1.C: New test.
+
        PR c++/11525
        * g++.dg/parse/constant4.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/opt/tmp1.C b/gcc/testsuite/g++.dg/opt/tmp1.C
new file mode 100644 (file)
index 0000000..2166533
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/tmp1.C
@@ -0,0 +1,48 @@
+// { dg-do run }
+
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 30 Jul 2003 <nathan@codesourcery.com>
+
+// compound exprs were causing additional temporaries.
+
+extern "C" int printf (char const *, ...);
+extern "C" void abort ();
+
+
+static unsigned order[] = 
+{
+  1, 2, 502, 102, 101,
+  0
+};
+
+static unsigned point;
+
+static void Check (unsigned t, unsigned i, void const *ptr, char const *name)
+{
+  printf ("%d %d %p %s\n", t, i, ptr, name);
+  
+  if (order[point++] != i + t)
+    abort ();
+  
+}
+
+template <int I> struct A 
+{
+  A () { Check (0, I, this, __PRETTY_FUNCTION__); }
+  ~A () { Check (100, I, this, __PRETTY_FUNCTION__); }
+  A (A const &) { Check (200, I, this, __PRETTY_FUNCTION__); }
+  A &operator= (A const &) { Check (300, I, this, __PRETTY_FUNCTION__); }
+  void Foo () const { Check (400, I, this, __PRETTY_FUNCTION__); }
+};
+
+template <int I> void Foo (A<I> a)
+{
+  Check (500, I, &a, __PRETTY_FUNCTION__);
+}
+
+int main ()
+{
+  Foo ((A<1> (), A<2> ()));
+  Check (0, 0, 0, "end");
+}