aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/expmed.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28052db..ced594f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-23 Richard Sandiford <richard.sandiford@linaro.org>
+ Alan Hayward <alan.hayward@arm.com>
+ David Sherwood <david.sherwood@arm.com>
+
+ * expmed.c (expand_shift_1): Use scalar_mode for scalar_mode.
+
2017-10-23 Richard Biener <rguenther@suse.de>
PR tree-optimization/82129
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 27f5ae4..eeb25d3 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -2337,12 +2337,10 @@ expand_shift_1 (enum tree_code code, machine_mode mode, rtx shifted,
optab lrotate_optab = rotl_optab;
optab rrotate_optab = rotr_optab;
machine_mode op1_mode;
- machine_mode scalar_mode = mode;
+ scalar_mode scalar_mode = GET_MODE_INNER (mode);
int attempt;
bool speed = optimize_insn_for_speed_p ();
- if (VECTOR_MODE_P (mode))
- scalar_mode = GET_MODE_INNER (mode);
op1 = amount;
op1_mode = GET_MODE (op1);