2014-06-25 Marc Glisse <marc.glisse@inria.fr>

	PR tree-optimization/57742
gcc/
	* tree-ssa-strlen.c (handle_builtin_memset): Update strinfo
	after replacing the statement.
gcc/testsuite/
	* gcc.dg/tree-ssa/calloc-3.c: New file.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 79847e3f7ee7fc162d8e4c2a59d77aab472f4a55..45d1df4d02fba44bce819669fa96622a973c4265 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-25  Marc Glisse  <marc.glisse@inria.fr>
+
+       PR tree-optimization/57742
+       * tree-ssa-strlen.c (handle_builtin_memset): Update strinfo
+       after replacing the statement.
+
 2014-06-25  Nick Clifton  <nickc@redhat.com>
 
        * config/v850/v850.c (GHS_default_section_names): Change to const

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 14e2017a99bae52343ee89691a5b752cc6243a61..c70169138941b4902094fad7031a7570b2ce51a8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-25  Marc Glisse  <marc.glisse@inria.fr>
+
+       PR tree-optimization/57742
+       * gcc.dg/tree-ssa/calloc-3.c: New file.
+
 2014-06-25  Richard Biener  <rguenther@suse.de>
 
        PR testsuite/61560

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c b/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c
new file mode 100644 (file)
index 0000000..3b3b3d6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+void*f(){
+    char*p=__builtin_malloc(42);
+    __builtin_memset(p,0,42);
+    __builtin_memset(p,0,42);
+    return p;
+};
+
+/* { dg-final { scan-tree-dump-not "malloc" "optimized" } } */
+/* { dg-final { scan-tree-dump-times "calloc" 1 "optimized" } } */
+/* { dg-final { scan-tree-dump-not "memset" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */

diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 6d7b852e90c48d9cf580feb94207b5bc0205729f..3bc2786de5fe533ddbef7adf09a668ece06fd0db 100644 (file)
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -1653,6 +1653,8 @@ handle_builtin_memset (gimple_stmt_iterator *gsi)
       gimple_stmt_iterator gsi1 = gsi_for_stmt (stmt1);
       update_gimple_call (&gsi1, builtin_decl_implicit (BUILT_IN_CALLOC), 2,
                          size, build_one_cst (size_type_node));
+      si1->length = build_int_cst (size_type_node, 0);
+      si1->stmt = gsi_stmt (gsi1);
     }
   else
     return true;