Tweak CanLoadFromObjectPool to return true even if obj.InVMHeap().

runtime/vm/assembler_arm64.cc

 // Copyright (c) 2014, 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_ARM64)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/longjump.h"
@@ skipping 493 matching lines @@
 
   // TODO(zra, kmillikin): Also load other large immediates from the object
   // pool
   if (object.IsSmi()) {
     // If the raw smi does not fit into a 32-bit signed int, then we'll keep
     // the raw value in the object pool.
     return !Utils::IsInt(32, reinterpret_cast<int64_t>(object.raw()));
   }
   ASSERT(object.IsNotTemporaryScopedHandle());
   ASSERT(object.IsOld());
-  return (Isolate::Current() != Dart::vm_isolate()) &&
-         // Not in the VMHeap, OR is one of the VMHeap objects we put in every
-         // object pool.
-         (!object.InVMHeap() || IsAlwaysInConstantPool(object));
+  return (Isolate::Current() != Dart::vm_isolate());
 }
 
 
 bool Assembler::CanLoadImmediateFromPool(int64_t imm, Register pp) {
   if (!allow_constant_pool()) {
     return false;
   }
   return !Utils::IsInt(32, imm) &&
          (pp != kNoPP) &&
          // We *could* put constants in the pool in a VM isolate, but it is
@@ skipping 34 matching lines @@
 
 
 void Assembler::LoadObject(Register dst, const Object& object, Register pp) {
   if (CanLoadObjectFromPool(object)) {
     const int32_t offset =
         Array::element_offset(FindObject(object, kNotPatchable));
     LoadWordFromPoolOffset(dst, pp, offset);
   } else {
     ASSERT((Isolate::Current() == Dart::vm_isolate()) ||
            object.IsSmi() ||
            object.InVMHeap());

[zra, 2015/01/14 17:53:24]

Don't need this anymore, I think.

[Vyacheslav Egorov (Google), 2015/01/14 17:56:33]

It still falls down here if !allow_constant_pool() so we better have an
assertion that it is safe to embed raw pointer like that.

     LoadDecodableImmediate(dst, reinterpret_cast<int64_t>(object.raw()), pp);
   }
 }
 
 
 void Assembler::CompareObject(Register reg, const Object& object, Register pp) {
   if (CanLoadObjectFromPool(object)) {
     LoadObject(TMP, object, pp);
     CompareRegisters(reg, TMP);
   } else {
@@ skipping 974 matching lines @@
     add(base, array, Operand(index, LSL, shift));
   }
   const OperandSize size = Address::OperandSizeFor(cid);
   ASSERT(Address::CanHoldOffset(offset, Address::Offset, size));
   return Address(base, offset, Address::Offset, size);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64