From: Jason Merrill <jason@redhat.com>
Date: Fri, 18 Mar 2011 15:06:51 +0000 (-0400)
Subject: re PR c++/23372 (Temporary aggregate copy not elided when passing parameters by value)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4ef8aac30e7c17756d6a1ad8cbd6c914e960bb4;p=gcc.git

re PR c++/23372 (Temporary aggregate copy not elided when passing parameters by value)

	PR c++/23372
	* gimplify.c (gimplify_arg): Strip redundant TARGET_EXPR.

From-SVN: r171146
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11fcfe7f171..712eefe8f05 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-18  Jason Merrill  <jason@redhat.com>
+
+	PR c++/23372
+	* gimplify.c (gimplify_arg): Strip redundant TARGET_EXPR.
+
 2011-03-18  Richard Guenther  <rguenther@suse.de>
 
 	* doc/install.texi (--enable-gold): Remove.
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 400493fa4fe..0b314a068c3 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -2255,7 +2255,17 @@ gimplify_arg (tree *arg_p, gimple_seq *pre_p, location_t call_location)
   if (is_gimple_reg_type (TREE_TYPE (*arg_p)))
     test = is_gimple_val, fb = fb_rvalue;
   else
-    test = is_gimple_lvalue, fb = fb_either;
+    {
+      test = is_gimple_lvalue, fb = fb_either;
+      /* Also strip a TARGET_EXPR that would force an extra copy.  */
+      if (TREE_CODE (*arg_p) == TARGET_EXPR)
+	{
+	  tree init = TARGET_EXPR_INITIAL (*arg_p);
+	  if (init
+	      && !VOID_TYPE_P (TREE_TYPE (init)))
+	    *arg_p = init;
+	}
+    }
 
   /* If this is a variable sized type, we must remember the size.  */
   maybe_with_size_expr (arg_p);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dcd19eadd26..b9c7dd84400 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-18  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/opt/pr23372.C: New.
+
 	* g++.dg/ext/attrib32.C: Expect errors on the two-names case.
 
 2011-03-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
diff --git a/gcc/testsuite/g++.dg/opt/pr23372.C b/gcc/testsuite/g++.dg/opt/pr23372.C
new file mode 100644
index 00000000000..9be4c9c568d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr23372.C
@@ -0,0 +1,15 @@
+// PR c++/23372
+// { dg-options -fdump-tree-gimple }
+
+// There shouldn't be an assignment to a temporary in the GIMPLE,
+// as that represents a redundant copy.
+// { dg-final { scan-tree-dump-not "=" gimple } }
+
+struct A {
+  int a[1000];
+  //A(A const &);
+};
+void f(A);
+void g(A *a) { f(*a); }
+
+// { dg-final { cleanup-tree-dump gimple } }