optabs.c (expand_binop): Pass INT_MODE to operand_subword_force iff the operand is...

	* optabs.c (expand_binop): Pass INT_MODE to operand_subword_force
	iff the operand is a constant.

	* gcc.c-torture/compile/20181114.c: New test.

2018-11-14  Ilya Leoshkevich  <iii@linux.ibm.com>

From-SVN: r266151

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3efd96b570e8df4f22ec0a07de717ecef8c2ab04..be75c6874c8798e4fe0087c87a8c0f01386da41e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-14  Jeff Law  <law@redhat.com>
+
+       * optabs.c (expand_binop): Pass INT_MODE to operand_subword_force
+       iff the operand is a constant.
+
 2018-11-14  Aldy Hernandez  <aldyh@redhat.com>
 
        * gimple-ssa-evrp-analyze.c

diff --git a/gcc/optabs.c b/gcc/optabs.c
index 6052222c90ce559ae3b11a40fbd2ebbf4a6bc8dc..c7d1f22e7a86757c2ac273002319e2f9dcc2ee9f 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -1377,12 +1377,14 @@ expand_binop (machine_mode mode, optab binoptab, rtx op0, rtx op1,
       start_sequence ();
 
       /* Do the actual arithmetic.  */
+      enum machine_mode op0_mode = CONSTANT_P (op0) ? int_mode : VOIDmode;
+      enum machine_mode op1_mode = CONSTANT_P (op1) ? int_mode : VOIDmode;
       for (i = 0; i < GET_MODE_BITSIZE (int_mode) / BITS_PER_WORD; i++)
        {
          rtx target_piece = operand_subword (target, i, 1, int_mode);
          rtx x = expand_binop (word_mode, binoptab,
-                               operand_subword_force (op0, i, int_mode),
-                               operand_subword_force (op1, i, int_mode),
+                               operand_subword_force (op0, i, op0_mode),
+                               operand_subword_force (op1, i, op1_mode),
                                target_piece, unsignedp, next_methods);
 
          if (x == 0)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 50e53f0b1963c9b7353cc6f1c3c47f9375c6ccf5..cee33796cc57658d2e0ed15748a26f64c840af27 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-14  Jeff Law  <law@redhat.com>
+
+       * gcc.c-torture/compile/20181114.c: New test.
+
 2018-11-14  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/87985

diff --git a/gcc/testsuite/gcc.c-torture/compile/20181114-1.c b/gcc/testsuite/gcc.c-torture/compile/20181114-1.c
new file mode 100644 (file)
index 0000000..9bcc399
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20181114-1.c
@@ -0,0 +1,6 @@
+int
+_vfprintf_r (double fp)
+{
+  if (__builtin_signbit (fp))
+    return '-';
+}