Do not use object pool for VM heap objects on ARM.

runtime/vm/assembler_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/assembler.h"
 #include "vm/simulator.h"
 #include "vm/runtime_entry.h"
@@ skipping 1244 matching lines @@
         movt(rd, value_high);
       }
       add(rd, PP, ShifterOperand(LR));
     }
     ldr(rd, Address(rd, offset_lo));
   }
 }
 
 
 void Assembler::LoadObject(Register rd, const Object& object) {
-  // Since objects in the VM heap are never relocated, test instead
-  // if (object.IsSmi() || object.InVMHeap()) {
-  // and modify the decoding code in CallPattern to understand movt, movw.
-  if (object.IsNull() ||
-      object.IsSmi() ||
-      (object.raw() == Bool::True().raw()) ||
-      (object.raw() == Bool::False().raw())) {
-    // This object is never relocated; do not use object pool.
+  // Smi's and VM heap objects are never relocated; do not use object pool.
+  if (object.IsSmi()) {
     LoadImmediate(rd, reinterpret_cast<int32_t>(object.raw()));
-    return;
+  } else if (object.InVMHeap()) {
+    // Make sure that class CallPattern is able to decode this load immediate.
+    const int32_t object_raw = reinterpret_cast<int32_t>(object.raw());
+    movw(rd, Utils::Low16Bits(object_raw));
+    const uint16_t value_high = Utils::High16Bits(object_raw);
+    if (value_high != 0) {
+      movt(rd, value_high);
+    }
+  } else {
+    // Make sure that class CallPattern is able to decode this load from the
+    // object pool.
+    const int32_t offset =
+        Array::data_offset() + 4*AddObject(object) - kHeapObjectTag;
+    LoadWordFromPoolOffset(rd, offset);
   }
-  const int32_t offset =
-      Array::data_offset() + 4*AddObject(object) - kHeapObjectTag;
-  LoadWordFromPoolOffset(rd, offset);
 }
 
 
 void Assembler::PushObject(const Object& object) {
   LoadObject(IP, object);
   Push(IP);
 }
 
 
 void Assembler::CompareObject(Register rn, const Object& object) {
@@ skipping 187 matching lines @@
 
 
 void Assembler::LoadImmediate(Register rd, int32_t value, Condition cond) {
   ShifterOperand shifter_op;
   if (ShifterOperand::CanHold(value, &shifter_op)) {
     mov(rd, shifter_op, cond);
   } else if (ShifterOperand::CanHold(~value, &shifter_op)) {
     mvn(rd, shifter_op, cond);
   } else {
     movw(rd, Utils::Low16Bits(value), cond);
-    uint16_t value_high = Utils::High16Bits(value);
+    const uint16_t value_high = Utils::High16Bits(value);
     if (value_high != 0) {
       movt(rd, value_high, cond);
     }
   }
 }
 
 
 void Assembler::LoadSImmediate(SRegister sd, float value, Condition cond) {
   if (!vmovs(sd, value, cond)) {
     LoadImmediate(IP, bit_cast<int32_t, float>(value), cond);
@@ skipping 173 matching lines @@
   } else {
     ASSERT(rn != IP);
     if (ShifterOperand::CanHold(~value, &shifter_op)) {
       mvn(IP, shifter_op, cond);
       add(rd, rn, ShifterOperand(IP), cond);
     } else if (ShifterOperand::CanHold(~(-value), &shifter_op)) {
       mvn(IP, shifter_op, cond);
       sub(rd, rn, ShifterOperand(IP), cond);
     } else {
       movw(IP, Utils::Low16Bits(value), cond);
-      uint16_t value_high = Utils::High16Bits(value);
+      const uint16_t value_high = Utils::High16Bits(value);
       if (value_high != 0) {
         movt(IP, value_high, cond);
       }
       add(rd, rn, ShifterOperand(IP), cond);
     }
   }
 }
 
 
 void Assembler::AddImmediateSetFlags(Register rd, Register rn, int32_t value,
                                     Condition cond) {
   ShifterOperand shifter_op;
   if (ShifterOperand::CanHold(value, &shifter_op)) {
     adds(rd, rn, shifter_op, cond);
   } else if (ShifterOperand::CanHold(-value, &shifter_op)) {
     subs(rd, rn, shifter_op, cond);
   } else {
     ASSERT(rn != IP);
     if (ShifterOperand::CanHold(~value, &shifter_op)) {
       mvn(IP, shifter_op, cond);
       adds(rd, rn, ShifterOperand(IP), cond);
     } else if (ShifterOperand::CanHold(~(-value), &shifter_op)) {
       mvn(IP, shifter_op, cond);
       subs(rd, rn, ShifterOperand(IP), cond);
     } else {
       movw(IP, Utils::Low16Bits(value), cond);
-      uint16_t value_high = Utils::High16Bits(value);
+      const uint16_t value_high = Utils::High16Bits(value);
       if (value_high != 0) {
         movt(IP, value_high, cond);
       }
       adds(rd, rn, ShifterOperand(IP), cond);
     }
   }
 }
 
 
 void Assembler::AddImmediateWithCarry(Register rd, Register rn, int32_t value,
                                      Condition cond) {
   ShifterOperand shifter_op;
   if (ShifterOperand::CanHold(value, &shifter_op)) {
     adc(rd, rn, shifter_op, cond);
   } else if (ShifterOperand::CanHold(-value - 1, &shifter_op)) {
     sbc(rd, rn, shifter_op, cond);
   } else {
     ASSERT(rn != IP);
     if (ShifterOperand::CanHold(~value, &shifter_op)) {
       mvn(IP, shifter_op, cond);
       adc(rd, rn, ShifterOperand(IP), cond);
     } else if (ShifterOperand::CanHold(~(-value - 1), &shifter_op)) {
       mvn(IP, shifter_op, cond);
       sbc(rd, rn, ShifterOperand(IP), cond);
     } else {
       movw(IP, Utils::Low16Bits(value), cond);
-      uint16_t value_high = Utils::High16Bits(value);
+      const uint16_t value_high = Utils::High16Bits(value);
       if (value_high != 0) {
         movt(IP, value_high, cond);
       }
       adc(rd, rn, ShifterOperand(IP), cond);
     }
   }
 }
 
 
 void Assembler::CompareImmediate(Register rn, int32_t value, Condition cond) {
@@ skipping 182 matching lines @@
   return ((((inst & kBranchOffsetMask) << 8) >> 6) + 8);
 }
 
 
 int32_t Assembler::AddObject(const Object& obj) {
   ASSERT(obj.IsNotTemporaryScopedHandle());
   ASSERT(obj.IsOld());
   if (object_pool_.IsNull()) {
     // The object pool cannot be used in the vm isolate.
     ASSERT(Isolate::Current() != Dart::vm_isolate());
-    object_pool_ = GrowableObjectArray::New();
+    object_pool_ = GrowableObjectArray::New(Heap::kOld);
   }
   for (int i = 0; i < object_pool_.Length(); i++) {
     if (object_pool_.At(i) == obj.raw()) {
       return i;
     }
   }
-  object_pool_.Add(obj);
+  object_pool_.Add(obj, Heap::kOld);
   return object_pool_.Length() - 1;
 }
 
 
 int32_t Assembler::AddExternalLabel(const ExternalLabel* label) {
   if (object_pool_.IsNull()) {
     // The object pool cannot be used in the vm isolate.
     ASSERT(Isolate::Current() != Dart::vm_isolate());
-    object_pool_ = GrowableObjectArray::New();
+    object_pool_ = GrowableObjectArray::New(Heap::kOld);
   }
   const word address = label->address();
   ASSERT(Utils::IsAligned(address, 4));
   // The address is stored in the object array as a RawSmi.
   const Smi& smi = Smi::Handle(Smi::New(address >> kSmiTagShift));
   // Do not reuse an existing entry, since each reference may be patched
   // independently.
-  object_pool_.Add(smi);
+  object_pool_.Add(smi, Heap::kOld);
   return object_pool_.Length() - 1;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM