Chromium Code Reviews| Index: src/x64/lithium-x64.cc |
| diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
| index 0945172962b9cceeaf7a1d522b97c20b1d40d222..5962f4c0ff5938fc201769deac35e405051da05c 100644 |
| --- a/src/x64/lithium-x64.cc |
| +++ b/src/x64/lithium-x64.cc |
| @@ -2287,10 +2287,15 @@ 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_fields && instr->field_representation().IsSmi()) { |
|
danno
2013/06/06 07:54:19
See comment from ia32 code.
Toon Verwaest
2013/06/06 10:31:41
Done.
|
| + if (!instr->value()->range()->IsInSmiRange()) { |
| + return AssignEnvironment(result); |
| + } |
| + } else if (FLAG_track_heap_object_fields && |
| + instr->field_representation().IsHeapObject()) { |
| + if (!instr->value()->type().IsHeapObject()) { |
| + return AssignEnvironment(result); |
| + } |
| } |
| return result; |
| } |