From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 28 Jan 2007 22:27:37 +0000 (+0000)
Subject: 	* builtins.c (expand_builtin_memset): Fix typo in my last patch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8eabf2297ba21d268a5c6bf3889e73aa5944904;p=thirdparty%2Fgcc.git

	* builtins.c (expand_builtin_memset): Fix typo in my last patch.
	* value-prof.c (stringop_block_profile): Likewise.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e8f2966e8f4..b04aed27ce2d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-28  Jan Hubicka  <jh@suse.cz>
+
+	* builtins.c (expand_builtin_memset): Fix typo in my last patch.
+	* value-prof.c (stringop_block_profile): Likewise.
+
 2007-01-28  Jan Hubicka  <jh@suse.cz>
 
 	* expr.c (emit_block_move_via_movmem, emit_block_move_via_libcall): Add
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 7947907d3eca..a2f540a416f6 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3700,7 +3700,8 @@ expand_builtin_memset (tree arglist, rtx target, enum machine_mode mode,
 			       builtin_memset_gen_str, val_rtx, dest_align, 0);
 	    }
 	  else if (!set_storage_via_setmem (dest_mem, len_rtx, val_rtx,
-					    dest_align, -1, 0))
+					    dest_align, expected_align,
+					    expected_size))
 	    goto do_libcall;
 
 	  dest_mem = force_operand (XEXP (dest_mem, 0), NULL_RTX);
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 4734355d816a..869e1693ac46 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -1449,7 +1449,7 @@ stringop_block_profile (tree stmt, unsigned int *expected_align,
     }
   histogram = gimple_histogram_value_of_type (cfun, stmt, HIST_TYPE_IOR);
   if (!histogram)
-    *expected_size = -1;
+    *expected_align = 0;
   else
     {
       gcov_type count;