| Index: src/crankshaft/x87/lithium-codegen-x87.cc
|
| diff --git a/src/crankshaft/x87/lithium-codegen-x87.cc b/src/crankshaft/x87/lithium-codegen-x87.cc
|
| index 20df76774bf58f4c66eb74ac37bc4a2aa3effd9f..9c932bc6ae8b81dd8b1496ba5758b6bcd4a05cb9 100644
|
| --- a/src/crankshaft/x87/lithium-codegen-x87.cc
|
| +++ b/src/crankshaft/x87/lithium-codegen-x87.cc
|
| @@ -2648,13 +2648,36 @@ void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) {
|
| Register context = ToRegister(instr->context());
|
| Register result = ToRegister(instr->result());
|
| __ mov(result, ContextOperand(context, instr->slot_index()));
|
| +
|
| + if (instr->hydrogen()->RequiresHoleCheck()) {
|
| + __ cmp(result, factory()->the_hole_value());
|
| + if (instr->hydrogen()->DeoptimizesOnHole()) {
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
| + } else {
|
| + Label is_not_hole;
|
| + __ 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;
|
| +
|
| Operand target = ContextOperand(context, instr->slot_index());
|
| + if (instr->hydrogen()->RequiresHoleCheck()) {
|
| + __ cmp(target, factory()->the_hole_value());
|
| + if (instr->hydrogen()->DeoptimizesOnHole()) {
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
| + } else {
|
| + __ j(not_equal, &skip_assignment, Label::kNear);
|
| + }
|
| + }
|
|
|
| __ mov(target, value);
|
| if (instr->hydrogen()->NeedsWriteBarrier()) {
|
| @@ -2666,6 +2689,8 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) {
|
| __ RecordWriteContextSlot(context, offset, value, temp, kSaveFPRegs,
|
| EMIT_REMEMBERED_SET, check_needed);
|
| }
|
| +
|
| + __ bind(&skip_assignment);
|
| }
|
|
|
|
|
|
|