Index: src/crankshaft/s390/lithium-s390.cc |
diff --git a/src/crankshaft/s390/lithium-s390.cc b/src/crankshaft/s390/lithium-s390.cc |
index ae7e8dbb08c573fda8987e67cc9f72dfad590e21..79868f5579d462cea4435cd6dafa1514d6384b2c 100644 |
--- a/src/crankshaft/s390/lithium-s390.cc |
+++ b/src/crankshaft/s390/lithium-s390.cc |
@@ -1766,7 +1766,12 @@ LInstruction* LChunkBuilder::DoConstant(HConstant* instr) { |
LInstruction* LChunkBuilder::DoLoadContextSlot(HLoadContextSlot* instr) { |
LOperand* context = UseRegisterAtStart(instr->value()); |
- return DefineAsRegister(new (zone()) LLoadContextSlot(context)); |
+ LInstruction* result = |
+ DefineAsRegister(new (zone()) LLoadContextSlot(context)); |
+ if (instr->RequiresHoleCheck() && instr->DeoptimizesOnHole()) { |
+ result = AssignEnvironment(result); |
+ } |
+ return result; |
} |
LInstruction* LChunkBuilder::DoStoreContextSlot(HStoreContextSlot* instr) { |
@@ -1779,7 +1784,11 @@ LInstruction* LChunkBuilder::DoStoreContextSlot(HStoreContextSlot* instr) { |
context = UseRegister(instr->context()); |
value = UseRegister(instr->value()); |
} |
- return new (zone()) LStoreContextSlot(context, value); |
+ LInstruction* result = new (zone()) LStoreContextSlot(context, value); |
+ if (instr->RequiresHoleCheck() && instr->DeoptimizesOnHole()) { |
+ result = AssignEnvironment(result); |
+ } |
+ return result; |
} |
LInstruction* LChunkBuilder::DoLoadNamedField(HLoadNamedField* instr) { |