Merge the Merlin heap tracing to top-of-trunk.

runtime/vm/assembler_ia32.cc

Index: runtime/vm/assembler_ia32.cc
diff --git a/runtime/vm/assembler_ia32.cc b/runtime/vm/assembler_ia32.cc
index 7fa7e217efe00e973f7e0ecef7194724cf7b7f7b..4dc798cee6e0fbc2f7740064ff466c1fe88517a5 100644
--- a/runtime/vm/assembler_ia32.cc
+++ b/runtime/vm/assembler_ia32.cc
@@ -6,7 +6,9 @@
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
+#include "vm/code_generator.h"
 #include "vm/heap.h"
+#include "vm/heap_trace.h"
 #include "vm/memory_region.h"
 #include "vm/runtime_entry.h"
 #include "vm/stub_code.h"
@@ -1620,6 +1622,7 @@ void Assembler::StoreIntoObject(Register object,
                                 const FieldAddress& dest,
                                 Register value) {
   ASSERT(object != value);
+  TraceStoreIntoObject(object, dest, value);
   movl(dest, value);
   Label done;
   StoreIntoObjectFilter(object, value, &done);
@@ -1635,6 +1638,7 @@ void Assembler::StoreIntoObject(Register object,
 void Assembler::StoreIntoObjectNoBarrier(Register object,
                                          const FieldAddress& dest,
                                          Register value) {
+  TraceStoreIntoObject(object, dest, value);
   movl(dest, value);
 #if defined(DEBUG)
   Label done;
@@ -1651,6 +1655,7 @@ void Assembler::StoreIntoObjectNoBarrier(Register object,
 void Assembler::StoreIntoObjectNoBarrier(Register object,
                                          const FieldAddress& dest,
                                          const Object& value) {
+  TraceStoreIntoObject(object, dest, value);
   if (value.IsSmi()) {
     movl(dest, Immediate(reinterpret_cast<int32_t>(value.raw())));
   } else {
@@ -1664,6 +1669,41 @@ void Assembler::StoreIntoObjectNoBarrier(Register object,
 }
 
 
+void Assembler::TraceStoreIntoObject(Register object,
+                                     const FieldAddress& dest,
+                                     Register value) {
+  if (HeapTrace::is_enabled()) {
+    pushal();
+    EnterCallRuntimeFrame(3 * kWordSize);
+    movl(Address(ESP, 0 * kWordSize), object);
+    leal(EAX, dest);
+    movl(Address(ESP, 1 * kWordSize), EAX);
+    movl(Address(ESP, 2 * kWordSize), value);
+    CallRuntime(kHeapTraceStoreRuntimeEntry);
+    LeaveCallRuntimeFrame();
+    popal();
+  }
+}
+
+
+void Assembler::TraceStoreIntoObject(Register object,
+                                     const FieldAddress& dest,
+                                     const Object& value) {
+  if (HeapTrace::is_enabled()) {
+    pushal();
+    EnterCallRuntimeFrame(3 * kWordSize);
+    movl(Address(ESP, 0 * kWordSize), object);
+    leal(EAX, dest);
+    movl(Address(ESP, 1 * kWordSize), EAX);
+    movl(Address(ESP, 2 * kWordSize),
+         Immediate(reinterpret_cast<int32_t>(value.raw())));

[siva, 2012/12/05 16:06:40]

This is not right, the raw value is directly being written into the instruction.
Not sure how this works.

Should be:
LoadObject(EAX, value);
movl(Address(ESP, 2 * kWordSize), EAX);

[cshapiro, 2012/12/08 03:23:08]

This method turns out to not be needed so I will be avoiding this issue all
together by removing this method and its calls.

+    CallRuntime(kHeapTraceStoreRuntimeEntry);
+    LeaveCallRuntimeFrame();
+    popal();
+  }
+}
+
+
 void Assembler::LoadDoubleConstant(XmmRegister dst, double value) {
   // TODO(5410843): Need to have a code constants table.
   int64_t constant = bit_cast<int64_t, double>(value);