Index: src/x64/lithium-x64.cc |
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
index 87c4a64bbb0c5d4b3566cf6295e91c9a66c3e79c..6cffc1c1ecb2ef6a8219f69c5397f8cc9059ee6f 100644 |
--- a/src/x64/lithium-x64.cc |
+++ b/src/x64/lithium-x64.cc |
@@ -2217,14 +2217,21 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) { |
result = DefineAsRegister(new(zone()) LLoadKeyed(backing_store, key)); |
} |
- if ((instr->is_external() || instr->is_fixed_typed_array()) ? |
- // see LCodeGen::DoLoadKeyedExternalArray |
- ((elements_kind == EXTERNAL_UINT32_ELEMENTS || |
- elements_kind == UINT32_ELEMENTS) && |
- !instr->CheckFlag(HInstruction::kUint32)) : |
- // see LCodeGen::DoLoadKeyedFixedDoubleArray and |
- // LCodeGen::DoLoadKeyedFixedArray |
- instr->RequiresHoleCheck()) { |
+ bool needs_environment; |
+ if (instr->is_external() || instr->is_fixed_typed_array()) { |
+ // see LCodeGen::DoLoadKeyedExternalArray |
+ needs_environment = (elements_kind == EXTERNAL_UINT32_ELEMENTS || |
+ elements_kind == UINT32_ELEMENTS) && |
+ !instr->CheckFlag(HInstruction::kUint32); |
+ } else { |
+ // see LCodeGen::DoLoadKeyedFixedDoubleArray and |
+ // LCodeGen::DoLoadKeyedFixedArray |
+ needs_environment = |
+ instr->RequiresHoleCheck() || |
+ (instr->hole_mode() == CONVERT_HOLE_TO_UNDEFINED && info()->IsStub()); |
+ } |
+ |
+ if (needs_environment) { |
result = AssignEnvironment(result); |
} |
return result; |