diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
index ffd4c737..cf926960 100644
--- a/qemu/target/arm/translate.c
+++ b/qemu/target/arm/translate.c
@@ -8994,8 +8994,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
                         shift = (insn >> 10) & 3;
                         /* ??? In many cases it's not necessary to do a
                            rotate, a shift is sufficient.  */
-                        if (shift != 0)
-                            tcg_gen_rotri_i32(tcg_ctx, tmp, tmp, shift * 8);
+                        tcg_gen_rotri_i32(tcg_ctx, tmp, tmp, shift * 8);
                         op1 = (insn >> 20) & 7;
                         switch (op1) {
                         case 0: gen_sxtb16(tmp);  break;
@@ -10068,8 +10067,7 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn)
             shift = (insn >> 4) & 3;
             /* ??? In many cases it's not necessary to do a
                rotate, a shift is sufficient.  */
-            if (shift != 0)
-                tcg_gen_rotri_i32(tcg_ctx, tmp, tmp, shift * 8);
+            tcg_gen_rotri_i32(tcg_ctx, tmp, tmp, shift * 8);
             op = (insn >> 20) & 7;
             switch (op) {
             case 0: gen_sxth(tmp);   break;
@@ -10796,11 +10794,10 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn)
                     case 7:
                         goto illegal_op;
                     default: /* Saturate.  */
-                        if (shift) {
-                            if (op & 1)
-                                tcg_gen_sari_i32(tcg_ctx, tmp, tmp, shift);
-                            else
-                                tcg_gen_shli_i32(tcg_ctx, tmp, tmp, shift);
+                        if (op & 1) {
+                            tcg_gen_sari_i32(tcg_ctx, tmp, tmp, shift);
+                        } else {
+                            tcg_gen_shli_i32(tcg_ctx, tmp, tmp, shift);
                         }
                         tmp2 = tcg_const_i32(tcg_ctx, imm);
                         if (op & 4) {
@@ -10991,9 +10988,7 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn)
                     goto illegal_op;
                 }
                 tmp = load_reg(s, rm);
-                if (shift) {
-                    tcg_gen_shli_i32(tcg_ctx, tmp, tmp, shift);
-                }
+                tcg_gen_shli_i32(tcg_ctx, tmp, tmp, shift);
                 tcg_gen_add_i32(tcg_ctx, addr, addr, tmp);
                 tcg_temp_free_i32(tcg_ctx, tmp);
                 break;