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

src/arm/lithium-codegen-arm.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_ARM_LITHIUM_CODEGEN_ARM_H_
 #define V8_ARM_LITHIUM_CODEGEN_ARM_H_
 
 #include "src/arm/lithium-arm.h"
 
 #include "src/arm/lithium-gap-resolver-arm.h"
@@ skipping 68 matching lines @@
                                        DwVfpRegister dbl_scratch);
   int32_t ToRepresentation(LConstantOperand* op, const Representation& r) const;
   int32_t ToInteger32(LConstantOperand* op) const;
   Smi* ToSmi(LConstantOperand* op) const;
   double ToDouble(LConstantOperand* op) const;
   Operand ToOperand(LOperand* op);
   MemOperand ToMemOperand(LOperand* op) const;
   // Returns a MemOperand pointing to the high word of a DoubleStackSlot.
   MemOperand ToHighMemOperand(LOperand* op) const;
 
-  template<class LI>
-  Operand ToShiftedRightOperand(LOperand* right, LI* shift_info);
-
-  int JSShiftAmountFromLConstant(LOperand* constant) {
-    return ToInteger32(LConstantOperand::cast(constant)) & 0x1f;
-  }
-
   bool IsInteger32(LConstantOperand* op) const;
   bool IsSmi(LConstantOperand* op) const;
   Handle<Object> ToHandle(LConstantOperand* op) const;
 
   // Try to generate code for the entire chunk, but it may fail if the
   // chunk contains constructs we cannot handle. Returns true if the
   // code generation attempt succeeded.
   bool GenerateCode();
 
   // Finish the code by setting stack height, safepoint, and bailout
@@ skipping 329 matching lines @@
   LCodeGen* codegen_;
   Label entry_;
   Label exit_;
   Label* external_exit_;
   int instruction_index_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_LITHIUM_CODEGEN_ARM_H_