Index: src/ppc/lithium-ppc.cc |
diff --git a/src/ppc/lithium-ppc.cc b/src/ppc/lithium-ppc.cc |
index d70143c3440b203756b0121b015170e6b3648dae..81eb3fd6e47a957e15e72379988e340e668b6bb1 100644 |
--- a/src/ppc/lithium-ppc.cc |
+++ b/src/ppc/lithium-ppc.cc |
@@ -2190,16 +2190,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; |