commit 59301e568447990886d44ae9da1ae0379332ac55
author Richard Coles <torne@google.com> Wed May 27 17:57:59 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 27 17:58:00 2015 +0000
tree 1d19688c879cfe0d4aa732b05e5373033c6d0531
parent b93c15fdb1adc488ef0b445eb8100981990a8843
parent 5cb7468791489ae8517021b446b785ca1963b177

Merge "Cherry-pick "ARM assembler: fix undefined behaviour in fits_shifter""

src/arm/assembler-arm.cc

diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index 17bf4f9..364ccfc 100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -991,7 +991,8 @@
                          Instr* instr) {
   // imm32 must be unsigned.
   for (int rot = 0; rot < 16; rot++) {
-    uint32_t imm8 = (imm32 << 2*rot) | (imm32 >> (32 - 2*rot));
+    uint32_t imm8 =
+        rot == 0 ? imm32 : (imm32 << 2 * rot) | (imm32 >> (32 - 2 * rot));
     if ((imm8 <= 0xff)) {
       *rotate_imm = rot;
       *immed_8 = imm8;