2011-10-10 Richard Guenther <rguenther@suse.de>

	PR middle-end/50389
	* gimple-fold.c (gimplify_and_update_call_from_tree): Do not
	mark symbols for renaming.  Append the VUSE to all statements
	that possibly can have one.

	* gcc.dg/torture/pr50389.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@179757 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 078c997c76ae35e3f95a5882c107afebdc6558f5..b3219b50c9fb068f2026f8b254be497e149a5de3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-10  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/50389
+       * gimple-fold.c (gimplify_and_update_call_from_tree): Do not
+       mark symbols for renaming.  Append the VUSE to all statements
+       that possibly can have one.
+
 2011-10-10  Richard Guenther  <rguenther@suse.de>
 
        * ipa-split.c (pass_split_functions): Add verification TODOs.

diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index b4993fdef924f70d3bc0ce272d2da760b33269cc..7df7e694aa2b9c980f32a01d53aa70823312a134 100644 (file)
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -588,13 +588,10 @@ gimplify_and_update_call_from_tree (gimple_stmt_iterator *si_p, tree expr)
        }
       new_stmt = gsi_stmt (i);
       if (gimple_in_ssa_p (cfun))
-       {
-         find_new_referenced_vars (new_stmt);
-         mark_symbols_for_renaming (new_stmt);
-       }
-      /* If the new statement has a VUSE, update it with exact SSA name we
-         know will reach this one.  */
-      if (gimple_vuse (new_stmt))
+       find_new_referenced_vars (new_stmt);
+      /* If the new statement possibly has a VUSE, update it with exact SSA
+        name we know will reach this one.  */
+      if (gimple_has_mem_ops (new_stmt))
        {
          /* If we've also seen a previous store create a new VDEF for
             the latter one, and make that the new reaching VUSE.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d978b82a379ff26a6251d92edf7610fab90bb7e..d3299d8d017d261d367eb225095b4d8b4a901f3d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-10  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/50389
+       * gcc.dg/torture/pr50389.c: New testcase.
+
 2011-10-10  Richard Guenther  <rguenther@suse.de>
 
        PR middle-end/50195

diff --git a/gcc/testsuite/gcc.dg/torture/pr50389.c b/gcc/testsuite/gcc.dg/torture/pr50389.c
new file mode 100644 (file)
index 0000000..6d8b095
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr50389.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-freorder-blocks -ftracer" } */
+
+extern int data[];
+extern int i;
+
+void
+foo (void)
+{
+  char buf[8];
+  __builtin___memcpy_chk (buf, data, i ? 8 : 4,
+                         __builtin_object_size (buf, 0));
+  __builtin___memcpy_chk (buf, data, i ? 8 : 4,
+                         __builtin_object_size (buf, 0));
+}