Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 1d97d8a91f255b4ca5c085a647522e2eef99a31e..f77f634fb2efbd376ec2486ed9ff61676278e405 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -254,10 +254,13 @@ bool LCodeGen::GeneratePrologue() { |
int heap_slots = info_->num_heap_slots() - Context::MIN_CONTEXT_SLOTS; |
if (heap_slots > 0) { |
Comment(";;; Allocate local context"); |
+ bool need_write_barrier = true; |
// Argument to NewContext is the function, which is still in edi. |
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); |
@@ -281,11 +284,18 @@ bool LCodeGen::GeneratePrologue() { |
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); |
+ } |
} |
} |
Comment(";;; End allocate local context"); |