Undo unnecessary changes to ARM assembler.

runtime/vm/assembler_arm.cc

Index: runtime/vm/assembler_arm.cc
===================================================================
--- runtime/vm/assembler_arm.cc	(revision 43595)
+++ runtime/vm/assembler_arm.cc	(working copy)
@@ -2710,6 +2710,22 @@
 }
 
 
+void Assembler::LoadDecodableImmediate(
+    Register rd, int32_t value, Condition cond) {
+  const ARMVersion version = TargetCPUFeatures::arm_version();
+  if ((version == ARMv5TE) || (version == ARMv6)) {
+    LoadPatchableImmediate(rd, value, cond);
+  } else {
+    ASSERT(version == ARMv7);
+    movw(rd, Utils::Low16Bits(value), cond);
+    const uint16_t value_high = Utils::High16Bits(value);
+    if (value_high != 0) {
+      movt(rd, value_high, cond);
+    }
+  }
+}
+
+
 void Assembler::LoadImmediate(Register rd, int32_t value, Condition cond) {
   Operand o;
   if (Operand::CanHold(value, &o)) {
@@ -2717,7 +2733,7 @@
   } else if (Operand::CanHold(~value, &o)) {
     mvn(rd, o, cond);
   } else {
-    LoadPatchableImmediate(rd, value, cond);
+    LoadDecodableImmediate(rd, value, cond);
   }
 }
 
@@ -3003,7 +3019,7 @@
       mvn(IP, o, cond);
       sub(rd, rn, Operand(IP), cond);
     } else {
-      LoadPatchableImmediate(IP, value, cond);
+      LoadDecodableImmediate(IP, value, cond);
       add(rd, rn, Operand(IP), cond);
     }
   }
@@ -3029,7 +3045,7 @@
       mvn(IP, o, cond);
       subs(rd, rn, Operand(IP), cond);
     } else {
-      LoadPatchableImmediate(IP, value, cond);
+      LoadDecodableImmediate(IP, value, cond);
       adds(rd, rn, Operand(IP), cond);
     }
   }
@@ -3055,7 +3071,7 @@
       mvn(IP, o, cond);
       adds(rd, rn, Operand(IP), cond);
     } else {
-      LoadPatchableImmediate(IP, value, cond);
+      LoadDecodableImmediate(IP, value, cond);
       subs(rd, rn, Operand(IP), cond);
     }
   }