Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 127bf3fdd96832a266ccc8f828f8173866932a95..5d10a7e73bce9df195aabe1e89c60dc4902d55fd 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -516,6 +516,8 @@ void StubCompiler::GenerateStoreTransition(MacroAssembler* masm, |
if (FLAG_track_fields && representation.IsSmi()) { |
__ JumpIfNotSmi(value_reg, miss_restore_name); |
+ } else if (FLAG_track_heap_object_fields && representation.IsHeapObject()) { |
+ __ JumpIfSmi(value_reg, miss_restore_name); |
} else if (FLAG_track_double_fields && representation.IsDouble()) { |
Label do_store, heap_number; |
__ LoadRoot(scratch3, Heap::kHeapNumberMapRootIndex); |
@@ -685,6 +687,8 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
ASSERT(!representation.IsNone()); |
if (FLAG_track_fields && representation.IsSmi()) { |
__ JumpIfNotSmi(value_reg, miss_label); |
+ } else if (FLAG_track_heap_object_fields && representation.IsHeapObject()) { |
+ __ JumpIfSmi(value_reg, miss_label); |
} else if (FLAG_track_double_fields && representation.IsDouble()) { |
// Load the double storage. |
if (index < 0) { |