Don't bother trying to reuse object pool entries for ICs, type test caches, or edge counters as the…

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"  // NOLINT
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/longjump.h"
@@ skipping 1563 matching lines @@
   } else {
     // Make sure that class CallPattern is able to decode this load from the
     // object pool.
     const int32_t offset =
         ObjectPool::element_offset(object_pool_wrapper_.FindObject(object));
     LoadWordFromPoolOffset(rd, offset - kHeapObjectTag, cond);
   }
 }
 
 
+void Assembler::LoadUniqueObject(Register rd,
+                                 const Object& object,
+                                 Condition cond) {
+  // Smis and VM heap objects are never relocated; do not use object pool.
+  if (object.IsSmi()) {
+    LoadImmediate(rd, reinterpret_cast<int32_t>(object.raw()), cond);
+  } else if (object.InVMHeap() || !allow_constant_pool()) {
+    // Make sure that class CallPattern is able to decode this load immediate.
+    const int32_t object_raw = reinterpret_cast<int32_t>(object.raw());
+    LoadImmediate(rd, object_raw, cond);
+  } else {
+    // Make sure that class CallPattern is able to decode this load from the
+    // object pool.
+    const int32_t offset =
+        ObjectPool::element_offset(object_pool_wrapper_.AddObject(object));
+    LoadWordFromPoolOffset(rd, offset - kHeapObjectTag, cond);
+  }
+}

[srdjan, 2015/07/07 21:57:23]

You could create a third function (private):
LoadObjectHelper(Register rd, const Object& object, Condition cond, bool
is_unique) {
  ...
  const int32_t offset = is_unique ?
      ObjectPool::element_offset(object_pool_wrapper_.AddObject(object)) :
      ObjectPool::element_offset(object_pool_wrapper_.FindObject(object));
  ...
}

Or you could use existing LoadObject and add as last argument 'bool is_unique =
false'.

What do you think?

[rmacnak, 2015/07/07 23:10:59]

I prefer a helper. Did that.

+
+
 void Assembler::LoadExternalLabel(Register rd,
                                   const ExternalLabel* label,
                                   Patchability patchable,
                                   Condition cond) {
   const int32_t offset = ObjectPool::element_offset(
       object_pool_wrapper_.FindExternalLabel(label, patchable));
   LoadWordFromPoolOffset(rd, offset - kHeapObjectTag, cond);
 }
 
 
@@ skipping 1993 matching lines @@
 
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfFpuRegisters));
   return fpu_reg_names[reg];
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM