Revert "ARM: Use the shifter operand to merge in previous shift instructions."

src/arm/assembler-arm.cc

Index: src/arm/assembler-arm.cc
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index 3a4eced74e18e9bf7904383b1b05c9eb81ed2de4..814bd8b1dcd637eb011bbef108b502d7a4218987 100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -281,7 +281,6 @@ Operand::Operand(Handle<Object> handle) {
 
 Operand::Operand(Register rm, ShiftOp shift_op, int shift_imm) {
   ASSERT(is_uint5(shift_imm));
-  ASSERT(shift_op != NO_SHIFT);
 
   rm_ = rm;
   rs_ = no_reg;
@@ -302,7 +301,7 @@ Operand::Operand(Register rm, ShiftOp shift_op, int shift_imm) {
 
 
 Operand::Operand(Register rm, ShiftOp shift_op, Register rs) {
-  ASSERT((shift_op != RRX) && (shift_op != NO_SHIFT));
+  ASSERT(shift_op != RRX);
   rm_ = rm;
   rs_ = no_reg;
   shift_op_ = shift_op;
@@ -958,16 +957,16 @@ void Assembler::next(Label* L) {
 // If this returns true then you have to use the rotate_imm and immed_8
 // that it returns, because it may have already changed the instruction
 // to match them!
-bool fits_shifter(uint32_t imm32,
-                  uint32_t* rotate_imm,
-                  uint32_t* immed_8,
-                  Instr* instr) {
+static bool fits_shifter(uint32_t imm32,
+                         uint32_t* rotate_imm,
+                         uint32_t* immed_8,
+                         Instr* instr) {
   // imm32 must be unsigned.
   for (int rot = 0; rot < 16; rot++) {
     uint32_t imm8 = (imm32 << 2*rot) | (imm32 >> (32 - 2*rot));
     if ((imm8 <= 0xff)) {
-      if (rotate_imm != NULL) *rotate_imm = rot;
-      if (immed_8 != NULL) *immed_8 = imm8;
+      *rotate_imm = rot;
+      *immed_8 = imm8;
       return true;
     }
   }
@@ -983,8 +982,7 @@ bool fits_shifter(uint32_t imm32,
           if (imm32 < 0x10000) {
             *instr ^= kMovwLeaveCCFlip;
             *instr |= EncodeMovwImmediate(imm32);
-            if (rotate_imm != NULL) *rotate_imm = 0;  // Not used for movw.
-            if (immed_8 != NULL) *immed_8 = 0;  // Not used for movw.
+            *rotate_imm = *immed_8 = 0;  // Not used for movw.
             return true;
           }
         }