We should not strip subregs of non-scalars during shift expansion.

	* expmed.c (expand_shift_1): Only strip scalar integer subregs.

From-SVN: r196027

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d4125050a494331b38a7ff43bf8efda3c7a67c03..bfaa7d302e5ea42612445ec125d047814f5ad123 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-13  David S. Miller  <davem@davemloft.net>
+
+       * expmed.c (expand_shift_1): Only strip scalar integer subregs.
+
 2013-02-13  Vladimir Makarov  <vmakarov@redhat.com>
 
        PR target/56184

diff --git a/gcc/expmed.c b/gcc/expmed.c
index 4a6ddb06b1105f68ffaac17d1c15dd555c957d8c..954a360c7b23c6b5bd60b3520e00c4c222bc5886 100644 (file)
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -2116,8 +2116,8 @@ expand_shift_1 (enum tree_code code, enum machine_mode mode, rtx shifted,
                       % GET_MODE_BITSIZE (mode));
       else if (GET_CODE (op1) == SUBREG
               && subreg_lowpart_p (op1)
-              && INTEGRAL_MODE_P (GET_MODE (SUBREG_REG (op1)))
-              && INTEGRAL_MODE_P (GET_MODE (op1)))
+              && SCALAR_INT_MODE_P (GET_MODE (SUBREG_REG (op1)))
+              && SCALAR_INT_MODE_P (GET_MODE (op1)))
        op1 = SUBREG_REG (op1);
     }