Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index da90a6705cd361f63f18b8ff78c7696f009a256b..e6d093955f0f0f5f9522e8e31dbe37d2e1462bc3 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -2130,7 +2130,7 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) { |
LOperand* key = UseRegisterOrConstantAtStart(instr->key()); |
LLoadKeyed* result = NULL; |
- if (!instr->is_external()) { |
+ if (!instr->is_external() && !instr->is_fixed_typed_array()) { |
LOperand* obj = NULL; |
if (instr->representation().IsDouble()) { |
obj = UseRegister(instr->elements()); |
@@ -2142,20 +2142,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()))) || |
Toon Verwaest
2014/01/16 10:54:51
remove () around IsDouble...
Dmitry Lomov (no reviews)
2014/01/16 13:52:18
Done.
|
(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())))); |
Toon Verwaest
2014/01/16 10:54:51
Remove () around IsDouble...
Dmitry Lomov (no reviews)
2014/01/16 13:52:18
Done.
|
+ 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) || |
Toon Verwaest
2014/01/16 10:54:51
remove ()
Dmitry Lomov (no reviews)
2014/01/16 13:52:18
Done.
|
+ (elements_kind == UINT32_ELEMENTS); |
return can_deoptimize ? AssignEnvironment(result) : result; |
} |
@@ -2172,7 +2171,7 @@ LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) { |
LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
- if (!instr->is_external()) { |
+ if (!instr->is_external() && !instr->is_fixed_typed_array()) { |
ASSERT(instr->elements()->representation().IsTagged()); |
bool needs_write_barrier = instr->NeedsWriteBarrier(); |
LOperand* object = NULL; |
@@ -2201,16 +2200,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); |
} |