builtins.c (expand_builtin_memset): Fix typo in my last patch.

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

From-SVN: r121272

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e8f2966e8f4b8a51818f3c1f72f4d7634ac1943..b04aed27ce2da521d51acb6042641e7a4f4354f7 100644 (file)
--- 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 7947907d3ecae1f89975e4df3e312f63adb6c015..a2f540a416f636c25d395f81f2238e83eadf9e5c 100644 (file)
--- 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 4734355d816a74521521030c315d416b77431354..869e1693ac46fc1b475bd3ac6931a5ef7937e785 100644 (file)
--- 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;