Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index d3ed88b529018bd617400448617576e3701b3ff9..954182c6d489d48d2e17f32e479521803633872e 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -2165,12 +2165,30 @@ void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) { |
Register context = ToRegister(instr->context()); |
Register result = ToRegister(instr->result()); |
__ mov(result, ContextOperand(context, instr->slot_index())); |
+ if (instr->RequiresHoleCheck()) { |
+ Label is_not_hole; |
+ __ cmp(result, factory()->the_hole_value()); |
+ __ j(not_equal, &is_not_hole, Label::kNear); |
+ |
+ __ mov(result, factory()->undefined_value()); |
+ |
+ __ bind(&is_not_hole); |
+ } |
} |
void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) { |
Register context = ToRegister(instr->context()); |
Register value = ToRegister(instr->value()); |
+ |
+ Label skip_assignment; |
+ |
+ if (instr->RequiresHoleCheck()) { |
+ __ cmp(ContextOperand(context, instr->slot_index()), |
+ factory()->the_hole_value()); |
+ __ j(not_equal, &skip_assignment, Label::kNear); |
+ } |
+ |
__ mov(ContextOperand(context, instr->slot_index()), value); |
if (instr->hydrogen()->NeedsWriteBarrier()) { |
HType type = instr->hydrogen()->value()->type(); |
@@ -2186,6 +2204,8 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) { |
EMIT_REMEMBERED_SET, |
check_needed); |
} |
+ |
+ __ bind(&skip_assignment); |
} |