re PR target/71554 (Miscompilation of __builtin_mul_overflow on i686)

	PR target/71554
	* config/i386/i386.md (setcc + movzbl peephole2): Use reg_set_p.
	(setcc + and peephole2): Likewise.

	Backported from mainline
	2015-04-29  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/i386.md (setcc+movzbl peephole2): Check also clobbered
	reg.
	(setcc+andl peephole2): Ditto.

From-SVN: r237522

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ec0552202b846f744d1bd90252920af105226be..b978c2c04334855534fc2a068f7fa30cd1cadd13 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2016-06-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/71554
+       * config/i386/i386.md (setcc + movzbl peephole2): Use reg_set_p.
+       (setcc + and peephole2): Likewise.
+
+       Backported from mainline
+       2015-04-29  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/i386.md (setcc+movzbl peephole2): Check also clobbered
+       reg.
+       (setcc+andl peephole2): Ditto.
+
 2016-06-13  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/71505

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index ea02e64e818a1ce654302ae40d966043fbcc3175..97a4f108712de9e06afa8c4f7039d96830fa8260 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -11248,7 +11248,8 @@
        (zero_extend (match_dup 1)))]
   "(peep2_reg_dead_p (3, operands[1])
     || operands_match_p (operands[1], operands[3]))
-   && ! reg_overlap_mentioned_p (operands[3], operands[0])"
+   && ! reg_overlap_mentioned_p (operands[3], operands[0])
+   && ! reg_set_p (operands[3], operands[4])"
   [(parallel [(set (match_dup 5) (match_dup 0))
              (match_dup 4)])
    (set (strict_low_part (match_dup 6))
@@ -11291,7 +11292,8 @@
              (clobber (reg:CC FLAGS_REG))])]
   "(peep2_reg_dead_p (3, operands[1])
     || operands_match_p (operands[1], operands[3]))
-   && ! reg_overlap_mentioned_p (operands[3], operands[0])"
+   && ! reg_overlap_mentioned_p (operands[3], operands[0])
+   && ! reg_set_p (operands[3], operands[4])"
   [(parallel [(set (match_dup 5) (match_dup 0))
              (match_dup 4)])
    (set (strict_low_part (match_dup 6))