i386.c (ix86_expand_movmem, [...]): Add zero guard even if align_bytes != 0 and…

i386.c (ix86_expand_movmem, [...]): Add zero guard even if align_bytes != 0 and count is smaller than size_needed.

	* config/i386/i386.c (ix86_expand_movmem, ix86_expand_setmem): Add
	zero guard even if align_bytes != 0 and count is smaller than
	size_needed.

From-SVN: r143229

gcc/ChangeLog

+2009-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/i386/i386.c (ix86_expand_movmem, ix86_expand_setmem): Add
+	zero guard even if align_bytes != 0 and count is smaller than
+	size_needed.
+
 2008-01-09  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/38495

gcc/config/i386/i386.c

@@ -17720,7 +17720,7 @@ ix86_expand_movmem (rtx dst, rtx src, rtx count_exp, rtx align_exp,
 	  count -= align_bytes;
 	}
       if (need_zero_guard
-	  && (!count
+	  && (count < (unsigned HOST_WIDE_INT) size_needed
 	      || (align_bytes == 0
 		  && count < ((unsigned HOST_WIDE_INT) size_needed
 			      + desired_align - align))))
@@ -18112,7 +18112,7 @@ ix86_expand_setmem (rtx dst, rtx count_exp, rtx val_exp, rtx align_exp,
 	  count -= align_bytes;
 	}
       if (need_zero_guard
-	  && (!count
+	  && (count < (unsigned HOST_WIDE_INT) size_needed
 	      || (align_bytes == 0
 		  && count < ((unsigned HOST_WIDE_INT) size_needed
 			      + desired_align - align))))