Index: src/x64/lithium-x64.cc |
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
index 1217a4000df42e15b91295e3cdbbe80c76846609..cde4e861b188a250fd99bdd69943cea5f406e2a3 100644 |
--- a/src/x64/lithium-x64.cc |
+++ b/src/x64/lithium-x64.cc |
@@ -1825,7 +1825,16 @@ LInstruction* LChunkBuilder::DoChange(HChange* instr) { |
ASSERT(to.IsInteger32()); |
LOperand* value = UseRegister(instr->value()); |
if (instr->value()->type().IsSmi()) { |
- return DefineSameAsFirst(new(zone()) LSmiUntag(value, false)); |
+ LInstruction* result = |
+ DefineSameAsFirst(new(zone()) LSmiUntag(value, false)); |
+ if (instr->value()->IsLoadKeyed()) { |
+ HLoadKeyed* load_keyed = HLoadKeyed::cast(instr->value()); |
+ if (load_keyed->UsesMustHandleHole() && |
+ load_keyed->hole_mode() == NEVER_RETURN_HOLE) { |
+ return AssignEnvironment(result); |
+ } |
+ } |
+ return result; |
} else { |
bool truncating = instr->CanTruncateToInt32(); |
LOperand* xmm_temp = truncating ? NULL : FixedTemp(xmm1); |