From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 11 Dec 2013 09:18:33 +0000 (+0100)
Subject: re PR tree-optimization/59386 (ICE on valid code at -O2 and -O3 on x86_64-linux-gnu... 
X-Git-Tag: releases/gcc-4.9.0~2146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8cb36a94c67ec4723475e68df75f9571b4ed198;p=thirdparty%2Fgcc.git

re PR tree-optimization/59386 (ICE on valid code at -O2 and -O3 on x86_64-linux-gnu in 64-bit mode)

	PR tree-optimization/59386
	* tree-inline.c (remap_gimple_stmt): If not id->do_not_unshare,
	unshare_expr (id->retval) before passing it to gimple_build_assign.

	* gcc.c-torture/compile/pr59386.c: New test.

From-SVN: r205883
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c581a9771b48..22caa76f771d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/59386
+	* tree-inline.c (remap_gimple_stmt): If not id->do_not_unshare,
+	unshare_expr (id->retval) before passing it to gimple_build_assign.
+
 2013-12-11  Bin Cheng  <bin.cheng@arm.com>
 
 	Reverted:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02da360515b4..ebd99960b42e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/59386
+	* gcc.c-torture/compile/pr59386.c: New test.
+
 2013-12-11  Bin Cheng  <bin.cheng@arm.com>
 
 	Reverted:
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr59386.c b/gcc/testsuite/gcc.c-torture/compile/pr59386.c
new file mode 100644
index 000000000000..b014f707ce73
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr59386.c
@@ -0,0 +1,24 @@
+/* PR tree-optimization/59386 */
+
+struct S { int s; };
+struct T { int t; struct S u; } c;
+int b;
+
+struct S
+foo ()
+{
+  struct T d;
+  if (b)
+    while (c.t)
+      ;
+  else
+    return d.u;
+}
+
+struct S
+bar ()
+{
+  struct T a;
+  a.u = foo ();
+  return a.u;
+}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index ab8e40b804a6..96a480593d46 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1273,7 +1273,9 @@ remap_gimple_stmt (gimple stmt, copy_body_data *id)
 		  || ! SSA_NAME_VAR (retval)
 		  || TREE_CODE (SSA_NAME_VAR (retval)) != RESULT_DECL)))
         {
-	  copy = gimple_build_assign (id->retvar, retval);
+	  copy = gimple_build_assign (id->do_not_unshare
+				      ? id->retvar : unshare_expr (id->retvar),
+				      retval);
 	  /* id->retvar is already substituted.  Skip it on later remapping.  */
 	  skip_first = true;
 	}