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

runtime/vm/assembler_ia32.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_ASSEMBLER_IA32_H_
 #define VM_ASSEMBLER_IA32_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_ia32.h directly; use assembler.h instead.
 #endif
@@ skipping 536 matching lines @@
                        const FieldAddress& dest,  // Where we are storing into.
                        Register value);  // Value we are storing.
 
   void StoreIntoObjectNoBarrier(Register object,
                                 const FieldAddress& dest,
                                 Register value);
   void StoreIntoObjectNoBarrier(Register object,
                                 const FieldAddress& dest,
                                 const Object& value);
 
+  void TraceStoreIntoObject(Register object,
+                            const FieldAddress& dest,
+                            Register value);
+  void TraceStoreIntoObject(Register object,
+                            const FieldAddress& dest,
+                            const Object& value);
+
   void DoubleNegate(XmmRegister d);
   void FloatNegate(XmmRegister f);
 
   void DoubleAbs(XmmRegister reg);
 
   void LockCmpxchgl(const Address& address, Register reg) {
     lock();
     cmpxchgl(address, reg);
   }
 
@@ skipping 130 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_IA32_H_