Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index 49747b7751889eb60e72e38572c95da567bcf358..ad34013a2a92391aea36c4e2a1fd694bc3de698e 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -2240,7 +2240,7 @@ |
LOperand* key = UseRegisterOrConstantAtStart(instr->key()); |
LInstruction* result = NULL; |
- if (!instr->is_fixed_typed_array()) { |
+ if (!instr->is_typed_elements()) { |
LOperand* obj = NULL; |
if (instr->representation().IsDouble()) { |
obj = UseRegister(instr->elements()); |
@@ -2260,9 +2260,10 @@ |
} |
bool needs_environment; |
- if (instr->is_fixed_typed_array()) { |
+ if (instr->is_external() || instr->is_fixed_typed_array()) { |
// see LCodeGen::DoLoadKeyedExternalArray |
- needs_environment = elements_kind == UINT32_ELEMENTS && |
+ needs_environment = (elements_kind == EXTERNAL_UINT32_ELEMENTS || |
+ elements_kind == UINT32_ELEMENTS) && |
!instr->CheckFlag(HInstruction::kUint32); |
} else { |
// see LCodeGen::DoLoadKeyedFixedDoubleArray and |
@@ -2297,7 +2298,7 @@ |
LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
- if (!instr->is_fixed_typed_array()) { |
+ if (!instr->is_typed_elements()) { |
DCHECK(instr->elements()->representation().IsTagged()); |
bool needs_write_barrier = instr->NeedsWriteBarrier(); |
LOperand* object = NULL; |