| Index: src/x64/lithium-x64.cc
|
| diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc
|
| index 0945172962b9cceeaf7a1d522b97c20b1d40d222..7f6a297f4592aa3f92c739df724e802136c1188e 100644
|
| --- a/src/x64/lithium-x64.cc
|
| +++ b/src/x64/lithium-x64.cc
|
| @@ -2287,10 +2287,11 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
| 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);
|
| + }
|
| }
|
| return result;
|
| }
|
|
|