| Index: src/ia32/stub-cache-ia32.cc
|
| diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc
|
| index ecb244409f08460558a48b7bce35b3cf935c15f5..6de9a410d13deb15902d7f26823c10fe987e64c0 100644
|
| --- a/src/ia32/stub-cache-ia32.cc
|
| +++ b/src/ia32/stub-cache-ia32.cc
|
| @@ -2582,14 +2582,24 @@ MaybeObject* StoreStubCompiler::CompileStoreGlobal(GlobalObject* object,
|
| Immediate(Handle<Map>(object->map())));
|
| __ j(not_equal, &miss, not_taken);
|
|
|
| - // Store the value in the cell.
|
| +
|
| + // Compute the cell operand to use.
|
| + Operand cell_operand = Operand::Cell(Handle<JSGlobalPropertyCell>(cell));
|
| if (Serializer::enabled()) {
|
| __ mov(ecx, Immediate(Handle<JSGlobalPropertyCell>(cell)));
|
| - __ mov(FieldOperand(ecx, JSGlobalPropertyCell::kValueOffset), eax);
|
| - } else {
|
| - __ mov(Operand::Cell(Handle<JSGlobalPropertyCell>(cell)), eax);
|
| + cell_operand = FieldOperand(ecx, JSGlobalPropertyCell::kValueOffset);
|
| }
|
|
|
| + // Check that the value in the cell is not the hole. If it is, this
|
| + // cell could have been deleted and reintroducing the global needs
|
| + // to update the property details in the property dictionary of the
|
| + // global object. We bail out to the runtime system to do that.
|
| + __ cmp(cell_operand, Factory::the_hole_value());
|
| + __ j(equal, &miss);
|
| +
|
| + // Store the value in the cell.
|
| + __ mov(cell_operand, eax);
|
| +
|
| // Return the value (register eax).
|
| __ IncrementCounter(&Counters::named_store_global_inline, 1);
|
| __ ret(0);
|
|
|