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

runtime/vm/assembler_x64.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_X64)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/heap.h"
@@ skipping 2824 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());
 }
 
 
 void Assembler::LoadWordFromPoolOffset(Register dst, Register pp,
                                        int32_t offset) {
   // This sequence must be of fixed size. AddressBaseImm32
   // forces the address operand to use a fixed-size imm32 encoding.
   movq(dst, Address::AddressBaseImm32(pp, offset));
 }
 
 
 void Assembler::LoadIsolate(Register dst) {
   movq(dst, Immediate(reinterpret_cast<uword>(Isolate::Current())));
 }
 
 
 void Assembler::LoadObject(Register dst, const Object& object, Register pp) {
   if (CanLoadFromObjectPool(object)) {
     const int32_t offset =
         Array::element_offset(FindObject(object, kNotPatchable));
     LoadWordFromPoolOffset(dst, pp, offset - kHeapObjectTag);
   } else {
     ASSERT((Isolate::Current() == Dart::vm_isolate()) ||
            object.IsSmi() ||
            object.InVMHeap());

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

I don't think we need object.InVMHeap() here anymore, then.

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

Ditto

     LoadImmediate(dst, Immediate(reinterpret_cast<int64_t>(object.raw())), pp);
   }
 }
 
 
 void Assembler::StoreObject(const Address& dst, const Object& object,
                             Register pp) {
   if (CanLoadFromObjectPool(object)) {
     LoadObject(TMP, object, pp);
     movq(dst, TMP);
@@ skipping 1118 matching lines @@
 
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64