[multiple changes]

2014-06-13  Jeff Law  <law@redhat.com>

	PR rtl-optimization/61094
	PR rtl-optimization/61446
	* ree.c (combine_reaching_defs): Get the mode for the copy from
	the extension insn rather than the defining insn.

2014-06-13  Ilya Enkovich  <ilya.enkovich@intel.com>

	PR rtl-optimization/61094
	PR rtl-optimization/61446
	* gcc.target/i386/pr61446.c : New.

From-SVN: r211649

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1999831867819bab9911da14504b8641496b8c42..545442326a1ead884aa5961cf26f6a23b5fa4514 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-13  Jeff Law  <law@redhat.com>
+
+       PR rtl-optimization/61094
+       PR rtl-optimization/61446
+       * ree.c (combine_reaching_defs): Get the mode for the copy from
+       the extension insn rather than the defining insn.
+
 2014-06-13  Dehao Chen  <dehao@google.com>
 
        * dwarf2out.c (add_linkage_name): Emit more linkage name.

diff --git a/gcc/ree.c b/gcc/ree.c
index ade413e8bede5cf7e48be6c43d0fefb7b4c6d8ad..f4bb4ccacd3327d9846fedeeed74d05e3d6d4797 100644 (file)
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -787,13 +787,16 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state)
         generated more than one insn.
 
          This generates garbage since we throw away the insn when we're
-        done, only to recreate it later if this test was successful.  */
+        done, only to recreate it later if this test was successful. 
+
+        Make sure to get the mode from the extension (cand->insn).  This
+        is different than in the code to emit the copy as we have not
+        modified the defining insn yet.  */
       start_sequence ();
-      rtx sub_rtx = *get_sub_rtx (def_insn);
       rtx pat = PATTERN (cand->insn);
-      rtx new_dst = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)),
+      rtx new_dst = gen_rtx_REG (GET_MODE (SET_DEST (pat)),
                                  REGNO (XEXP (SET_SRC (pat), 0)));
-      rtx new_src = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)),
+      rtx new_src = gen_rtx_REG (GET_MODE (SET_DEST (pat)),
                                  REGNO (SET_DEST (pat)));
       emit_move_insn (new_dst, new_src);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 262c682b4d0ea8586141c8094206ce2c94852c43..1b63a2d47aeb1efc982f9c02a74e62644ca69546 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-13  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+       PR rtl-optimization/61094
+       PR rtl-optimization/61446
+       * gcc.target/i386/pr61446.c : New.
+
 2014-06-13  Dehao Chen  <dehao@google.com>
 
        * g++.dg/debug/dwarf2/cdtor-1.C: Update test result.

diff --git a/gcc/testsuite/gcc.target/i386/pr61446.c b/gcc/testsuite/gcc.target/i386/pr61446.c
new file mode 100644 (file)
index 0000000..fc32f63
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr61446.c
@@ -0,0 +1,14 @@
+/* PR rtl-optimization/61446 */
+
+/* { dg-do compile { target { ia32 } } } */
+/* { dg-options "-O2 -march=corei7 -mfpmath=387" } */
+
+unsigned long long
+foo (float a)
+{
+  const double dfa = a;
+  const unsigned int hi = dfa / 0x1p32f;
+  const unsigned int lo = dfa - (double) hi * 0x1p32f;
+
+  return ((unsigned long long) hi << (4 * (8))) | lo;
+}