| Index: src/arm64/lithium-arm64.cc
|
| diff --git a/src/arm64/lithium-arm64.cc b/src/arm64/lithium-arm64.cc
|
| index 8682e2b82fc190cce90c98b6c2a01f7d1635b9fa..8323405b46e80414b41991fbc80bf6b9404ac81b 100644
|
| --- a/src/arm64/lithium-arm64.cc
|
| +++ b/src/arm64/lithium-arm64.cc
|
| @@ -1665,9 +1665,10 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) {
|
| ASSERT(instr->key()->representation().IsSmiOrInteger32());
|
| ElementsKind elements_kind = instr->elements_kind();
|
| LOperand* elements = UseRegister(instr->elements());
|
| - LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
|
|
| if (!instr->is_typed_elements()) {
|
| + LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
| +
|
| if (instr->representation().IsDouble()) {
|
| LOperand* temp = (!instr->key()->IsConstant() ||
|
| instr->RequiresHoleCheck())
|
| @@ -1695,6 +1696,7 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) {
|
| (instr->representation().IsDouble() &&
|
| IsDoubleOrFloatElementsKind(instr->elements_kind())));
|
|
|
| + LOperand* key = UseRegisterOrConstant(instr->key());
|
| LOperand* temp = instr->key()->IsConstant() ? NULL : TempRegister();
|
| LInstruction* result = DefineAsRegister(
|
| new(zone()) LLoadKeyedExternal(elements, key, temp));
|
| @@ -2187,7 +2189,6 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| LOperand* temp = NULL;
|
| LOperand* elements = NULL;
|
| LOperand* val = NULL;
|
| - LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
|
|
| if (!instr->is_typed_elements() &&
|
| instr->value()->representation().IsTagged() &&
|
| @@ -2211,16 +2212,19 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| instr->elements()->representation().IsTagged()) ||
|
| (instr->is_external() &&
|
| instr->elements()->representation().IsExternal()));
|
| + LOperand* key = UseRegisterOrConstant(instr->key());
|
| return new(zone()) LStoreKeyedExternal(elements, key, val, temp);
|
|
|
| } else if (instr->value()->representation().IsDouble()) {
|
| ASSERT(instr->elements()->representation().IsTagged());
|
| + LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
| return new(zone()) LStoreKeyedFixedDouble(elements, key, val, temp);
|
|
|
| } else {
|
| ASSERT(instr->elements()->representation().IsTagged());
|
| ASSERT(instr->value()->representation().IsSmiOrTagged() ||
|
| instr->value()->representation().IsInteger32());
|
| + LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
| return new(zone()) LStoreKeyedFixed(elements, key, val, temp);
|
| }
|
| }
|
|
|