| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index fbc75d0e322350cc85f8d8e87bb440a85fca4cec..8f76c5ad365b3601001acd75318b326107a6a42c 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -2116,6 +2116,8 @@ LInstruction* LChunkBuilder::DoTransitionElementsKind(
|
|
|
| LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
| bool needs_write_barrier = instr->NeedsWriteBarrier();
|
| + bool needs_write_barrier_for_map = !instr->transition().is_null() &&
|
| + instr->NeedsWriteBarrierForMap();
|
|
|
| LOperand* obj;
|
| if (needs_write_barrier) {
|
| @@ -2123,7 +2125,9 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
| ? UseRegister(instr->object())
|
| : UseTempRegister(instr->object());
|
| } else {
|
| - obj = UseRegisterAtStart(instr->object());
|
| + obj = needs_write_barrier_for_map
|
| + ? UseRegister(instr->object())
|
| + : UseRegisterAtStart(instr->object());
|
| }
|
|
|
| LOperand* val = needs_write_barrier
|
| @@ -2132,11 +2136,13 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
|
|
| // We only need a scratch register if we have a write barrier or we
|
| // have a store into the properties array (not in-object-property).
|
| - LOperand* temp = (!instr->is_in_object() || needs_write_barrier)
|
| - ? TempRegister()
|
| - : NULL;
|
| + LOperand* temp = (!instr->is_in_object() || needs_write_barrier ||
|
| + needs_write_barrier_for_map) ? TempRegister() : NULL;
|
| +
|
| + // We need a temporary register for write barrier of the map field.
|
| + LOperand* temp_map = needs_write_barrier_for_map ? TempRegister() : NULL;
|
|
|
| - return new(zone()) LStoreNamedField(obj, val, temp);
|
| + return new(zone()) LStoreNamedField(obj, val, temp, temp_map);
|
| }
|
|
|
|
|
|
|