Index: src/mips/lithium-mips.cc |
diff --git a/src/mips/lithium-mips.cc b/src/mips/lithium-mips.cc |
index 1298b4cee6014d7bcafcac9f779d58dc2a793253..2676d43b9ec6abf198b43fdf690b8072fb015ff6 100644 |
--- a/src/mips/lithium-mips.cc |
+++ b/src/mips/lithium-mips.cc |
@@ -2035,7 +2035,7 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) { |
LOperand* key = UseRegisterOrConstantAtStart(instr->key()); |
LLoadKeyed* result = NULL; |
- if (!instr->is_external()) { |
+ if (!instr->is_typed_elements()) { |
LOperand* obj = NULL; |
if (instr->representation().IsDouble()) { |
obj = UseRegister(instr->elements()); |
@@ -2047,20 +2047,19 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) { |
} else { |
ASSERT( |
(instr->representation().IsInteger32() && |
- (elements_kind != EXTERNAL_FLOAT_ELEMENTS) && |
- (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || |
+ !IsDoubleOrFloatElementsKind(instr->elements_kind())) || |
(instr->representation().IsDouble() && |
- ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || |
- (elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); |
- LOperand* external_pointer = UseRegister(instr->elements()); |
- result = new(zone()) LLoadKeyed(external_pointer, key); |
+ IsDoubleOrFloatElementsKind(instr->elements_kind()))); |
+ LOperand* backing_store = UseRegister(instr->elements()); |
+ result = new(zone()) LLoadKeyed(backing_store, key); |
} |
DefineAsRegister(result); |
// An unsigned int array load might overflow and cause a deopt, make sure it |
// has an environment. |
bool can_deoptimize = instr->RequiresHoleCheck() || |
- (elements_kind == EXTERNAL_UNSIGNED_INT_ELEMENTS); |
+ elements_kind == EXTERNAL_UNSIGNED_INT_ELEMENTS || |
+ elements_kind == UINT32_ELEMENTS; |
return can_deoptimize ? AssignEnvironment(result) : result; |
} |
@@ -2077,7 +2076,7 @@ LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) { |
LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
- if (!instr->is_external()) { |
+ if (!instr->is_typed_elements()) { |
ASSERT(instr->elements()->representation().IsTagged()); |
bool needs_write_barrier = instr->NeedsWriteBarrier(); |
LOperand* object = NULL; |
@@ -2106,17 +2105,17 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
ASSERT( |
(instr->value()->representation().IsInteger32() && |
- (instr->elements_kind() != EXTERNAL_FLOAT_ELEMENTS) && |
- (instr->elements_kind() != EXTERNAL_DOUBLE_ELEMENTS)) || |
+ !IsDoubleOrFloatElementsKind(instr->elements_kind())) || |
(instr->value()->representation().IsDouble() && |
- ((instr->elements_kind() == EXTERNAL_FLOAT_ELEMENTS) || |
- (instr->elements_kind() == EXTERNAL_DOUBLE_ELEMENTS)))); |
- ASSERT(instr->elements()->representation().IsExternal()); |
+ IsDoubleOrFloatElementsKind(instr->elements_kind()))); |
+ ASSERT((instr->is_fixed_typed_array() && |
+ instr->elements()->representation().IsTagged()) || |
+ (instr->is_external() && |
+ instr->elements()->representation().IsExternal())); |
LOperand* val = UseRegister(instr->value()); |
LOperand* key = UseRegisterOrConstantAtStart(instr->key()); |
- LOperand* external_pointer = UseRegister(instr->elements()); |
- |
- return new(zone()) LStoreKeyed(external_pointer, key, val); |
+ LOperand* backing_store = UseRegister(instr->elements()); |
+ return new(zone()) LStoreKeyed(backing_store, key, val); |
} |