| Index: src/ia32/full-codegen-ia32.cc
|
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
|
| index 07afba6c80d7ad264907a42904c29cc3689aac32..88dad86da8379d1b09526661876cf8286bc33a31 100644
|
| --- a/src/ia32/full-codegen-ia32.cc
|
| +++ b/src/ia32/full-codegen-ia32.cc
|
| @@ -198,6 +198,7 @@ void FullCodeGenerator::Generate() {
|
| int heap_slots = info->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS;
|
| if (heap_slots > 0) {
|
| Comment cmnt(masm_, "[ Allocate context");
|
| + bool need_write_barrier = true;
|
| // Argument to NewContext is the function, which is still in edi.
|
| if (FLAG_harmony_scoping && info->scope()->is_global_scope()) {
|
| __ push(edi);
|
| @@ -206,6 +207,8 @@ void FullCodeGenerator::Generate() {
|
| } else if (heap_slots <= FastNewContextStub::kMaximumSlots) {
|
| FastNewContextStub stub(isolate(), heap_slots);
|
| __ CallStub(&stub);
|
| + // Result of FastNewContextStub is always in new space.
|
| + need_write_barrier = false;
|
| } else {
|
| __ push(edi);
|
| __ CallRuntime(Runtime::kHiddenNewFunctionContext, 1);
|
| @@ -229,11 +232,18 @@ void FullCodeGenerator::Generate() {
|
| int context_offset = Context::SlotOffset(var->index());
|
| __ mov(Operand(esi, context_offset), eax);
|
| // Update the write barrier. This clobbers eax and ebx.
|
| - __ RecordWriteContextSlot(esi,
|
| - context_offset,
|
| - eax,
|
| - ebx,
|
| - kDontSaveFPRegs);
|
| + if (need_write_barrier) {
|
| + __ RecordWriteContextSlot(esi,
|
| + context_offset,
|
| + eax,
|
| + ebx,
|
| + kDontSaveFPRegs);
|
| + } else if (FLAG_debug_code) {
|
| + Label done;
|
| + __ JumpIfInNewSpace(esi, eax, &done, Label::kNear);
|
| + __ Abort(kExpectedNewSpaceObject);
|
| + __ bind(&done);
|
| + }
|
| }
|
| }
|
| }
|
|
|