Revert "Forbid the use of shifts in ShifterOperand in Thumb2"

This reverts commit bada8b0f0a10bd32d6cb87ed4e57f2aa3d7c03c2.

Change-Id: Ic89c76367c8ab91cfb5d1510789ac2e352922da8

2 files changed, 0 insertions, 6 deletions

diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h
index dd0dba2df4..8730f52eca 100644
--- a/compiler/utils/arm/assembler_arm.h
+++ b/compiler/utils/arm/assembler_arm.h
@@ -100,10 +100,6 @@ class ShifterOperand {
     return rm_;
   }
 
-  Register GetSecondRegister() const {
-    return rs_;
-  }
-
   enum Type {
     kUnknown = -1,
     kRegister,
diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc
index eb5b4540f9..6d0571e263 100644
--- a/compiler/utils/arm/assembler_thumb2.cc
+++ b/compiler/utils/arm/assembler_thumb2.cc
@@ -921,8 +921,6 @@ void Thumb2Assembler::Emit16BitDataProcessing(Condition cond,
       use_immediate = true;
       immediate = so.GetImmediate();
     } else {
-      CHECK(!(so.IsRegister() && so.IsShift() && so.GetSecondRegister() != kNoRegister))
-          << "No register-shifted register instruction available in thumb";
       // Adjust rn and rd: only two registers will be emitted.
       switch (opcode) {
         case AND: