Do not emit pointer information for embedded singleton VM Isolate objects while generating code. Th…

vm/assembler_x64.cc

Index: vm/assembler_x64.cc
===================================================================
--- vm/assembler_x64.cc	(revision 16624)
+++ vm/assembler_x64.cc	(working copy)
@@ -1649,7 +1649,7 @@
 
 
 void Assembler::LoadObject(Register dst, const Object& object) {
-  if (object.IsSmi() || object.IsNull()) {
+  if (object.IsSmi() || object.IsNull() || object.InVMHeap()) {
     movq(dst, Immediate(reinterpret_cast<int64_t>(object.raw())));
   } else {
     ASSERT(object.IsNotTemporaryScopedHandle());
@@ -1663,7 +1663,7 @@
 
 
 void Assembler::StoreObject(const Address& dst, const Object& object) {
-  if (object.IsSmi() || object.IsNull()) {
+  if (object.IsSmi() || object.IsNull() || object.InVMHeap()) {
     movq(dst, Immediate(reinterpret_cast<int64_t>(object.raw())));
   } else {
     ASSERT(object.IsNotTemporaryScopedHandle());
@@ -1675,7 +1675,7 @@
 
 
 void Assembler::PushObject(const Object& object) {
-  if (object.IsSmi() || object.IsNull()) {
+  if (object.IsSmi() || object.IsNull() || object.InVMHeap()) {
     pushq(Immediate(reinterpret_cast<int64_t>(object.raw())));
   } else {
     LoadObject(TMP, object);
@@ -1685,7 +1685,7 @@
 
 
 void Assembler::CompareObject(Register reg, const Object& object) {
-  if (object.IsSmi() || object.IsNull()) {
+  if (object.IsSmi() || object.IsNull() || object.InVMHeap()) {
     cmpq(reg, Immediate(reinterpret_cast<int64_t>(object.raw())));
   } else {
     ASSERT(reg != TMP);