- Tighten assertions in the X64 assembler related to object pool usage.

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"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
@@ skipping 2189 matching lines @@
   }
   // If the call is patchable, do not reuse an existing entry since each
   // reference may be patched independently.
   object_pool_.Add(smi, Heap::kOld);
   patchable_pool_entries_.Add(patchable);
   return object_pool_.Length() - 1;
 }
 
 
 bool Assembler::CanLoadFromObjectPool(const Object& object) {
-  return !object.IsSmi() &&  // Not a Smi
+  // TODO(zra, kmillikin): Move the use of large Smis into the constant pool.
+  if (object.IsSmi()) {
+    return false;
+  }
+  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.
+         // TODO(zra): Evaluate putting all VM heap objects into the pool.
          (!object.InVMHeap() || (object.raw() == Object::null()) ||
                                 (object.raw() == Bool::True().raw()) ||
-                                (object.raw() == Bool::False().raw())) &&
-         object.IsNotTemporaryScopedHandle() &&
-         object.IsOld();
+                                (object.raw() == Bool::False().raw()));
 }
 
 
 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::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());
     movq(dst, Immediate(reinterpret_cast<int64_t>(object.raw())));
   }
 }
 
 
 void Assembler::StoreObject(const Address& dst, const Object& object) {
   if (CanLoadFromObjectPool(object)) {
     LoadObject(TMP, object, PP);
     movq(dst, TMP);
   } else {
@@ skipping 608 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