Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index 1c64d8e61ef97c39781ea1afb1be93f48ee254c3..f5d1a28acfa62617634eb2f5ccb04a1991906725 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -2347,10 +2347,11 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) { |
LOperand* temp = needs_write_barrier_for_map ? TempRegister() : NULL; |
LStoreNamedField* result = new(zone()) LStoreNamedField(obj, val, temp); |
- if ((FLAG_track_fields && instr->field_representation().IsSmi()) || |
- (FLAG_track_heap_object_fields && |
- instr->field_representation().IsHeapObject())) { |
- return AssignEnvironment(result); |
+ if (FLAG_track_heap_object_fields && |
+ instr->field_representation().IsHeapObject()) { |
+ if (!instr->value()->type().IsHeapObject()) { |
+ return AssignEnvironment(result); |
+ } |
danno
2013/06/06 13:07:32
Please split into another CL
Toon Verwaest
2013/06/06 13:22:26
Done.
|
} |
return result; |
} |