| Index: src/mips64/lithium-codegen-mips64.cc | 
| diff --git a/src/mips64/lithium-codegen-mips64.cc b/src/mips64/lithium-codegen-mips64.cc | 
| index de7d5189235c0ec6f557b4db86063c8c86d177fa..3ac0429a3bf11109252cc5e4569b17a662c6883b 100644 | 
| --- a/src/mips64/lithium-codegen-mips64.cc | 
| +++ b/src/mips64/lithium-codegen-mips64.cc | 
| @@ -3229,10 +3229,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { | 
| : element_size_shift; | 
| int base_offset = instr->base_offset(); | 
|  | 
| -  if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || | 
| -      elements_kind == FLOAT32_ELEMENTS || | 
| -      elements_kind == EXTERNAL_FLOAT64_ELEMENTS || | 
| -      elements_kind == FLOAT64_ELEMENTS) { | 
| +  if (elements_kind == FLOAT32_ELEMENTS || elements_kind == FLOAT64_ELEMENTS) { | 
| FPURegister result = ToDoubleRegister(instr->result()); | 
| if (key_is_constant) { | 
| __ Daddu(scratch0(), external_pointer, | 
| @@ -3249,8 +3246,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { | 
| } | 
| __ Daddu(scratch0(), scratch0(), external_pointer); | 
| } | 
| -    if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || | 
| -        elements_kind == FLOAT32_ELEMENTS) { | 
| +    if (elements_kind == FLOAT32_ELEMENTS) { | 
| __ lwc1(result, MemOperand(scratch0(), base_offset)); | 
| __ cvt_d_s(result, result); | 
| } else  {  // i.e. elements_kind == EXTERNAL_DOUBLE_ELEMENTS | 
| @@ -3262,29 +3258,22 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { | 
| key, external_pointer, key_is_constant, constant_key, | 
| element_size_shift, shift_size, base_offset); | 
| switch (elements_kind) { | 
| -      case EXTERNAL_INT8_ELEMENTS: | 
| case INT8_ELEMENTS: | 
| __ lb(result, mem_operand); | 
| break; | 
| -      case EXTERNAL_UINT8_CLAMPED_ELEMENTS: | 
| -      case EXTERNAL_UINT8_ELEMENTS: | 
| case UINT8_ELEMENTS: | 
| case UINT8_CLAMPED_ELEMENTS: | 
| __ lbu(result, mem_operand); | 
| break; | 
| -      case EXTERNAL_INT16_ELEMENTS: | 
| case INT16_ELEMENTS: | 
| __ lh(result, mem_operand); | 
| break; | 
| -      case EXTERNAL_UINT16_ELEMENTS: | 
| case UINT16_ELEMENTS: | 
| __ lhu(result, mem_operand); | 
| break; | 
| -      case EXTERNAL_INT32_ELEMENTS: | 
| case INT32_ELEMENTS: | 
| __ lw(result, mem_operand); | 
| break; | 
| -      case EXTERNAL_UINT32_ELEMENTS: | 
| case UINT32_ELEMENTS: | 
| __ lw(result, mem_operand); | 
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) { | 
| @@ -3294,8 +3283,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { | 
| break; | 
| case FLOAT32_ELEMENTS: | 
| case FLOAT64_ELEMENTS: | 
| -      case EXTERNAL_FLOAT32_ELEMENTS: | 
| -      case EXTERNAL_FLOAT64_ELEMENTS: | 
| case FAST_DOUBLE_ELEMENTS: | 
| case FAST_ELEMENTS: | 
| case FAST_SMI_ELEMENTS: | 
| @@ -3433,7 +3420,7 @@ void LCodeGen::DoLoadKeyedFixedArray(LLoadKeyed* instr) { | 
|  | 
|  | 
| void LCodeGen::DoLoadKeyed(LLoadKeyed* instr) { | 
| -  if (instr->is_typed_elements()) { | 
| +  if (instr->is_fixed_typed_array()) { | 
| DoLoadKeyedExternalArray(instr); | 
| } else if (instr->hydrogen()->representation().IsDouble()) { | 
| DoLoadKeyedFixedDoubleArray(instr); | 
| @@ -4459,10 +4446,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { | 
| : element_size_shift; | 
| int base_offset = instr->base_offset(); | 
|  | 
| -  if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || | 
| -      elements_kind == FLOAT32_ELEMENTS || | 
| -      elements_kind == EXTERNAL_FLOAT64_ELEMENTS || | 
| -      elements_kind == FLOAT64_ELEMENTS) { | 
| +  if (elements_kind == FLOAT32_ELEMENTS || elements_kind == FLOAT64_ELEMENTS) { | 
| Register address = scratch0(); | 
| FPURegister value(ToDoubleRegister(instr->value())); | 
| if (key_is_constant) { | 
| @@ -4485,8 +4469,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { | 
| __ Daddu(address, external_pointer, address); | 
| } | 
|  | 
| -    if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || | 
| -        elements_kind == FLOAT32_ELEMENTS) { | 
| +    if (elements_kind == FLOAT32_ELEMENTS) { | 
| __ cvt_s_d(double_scratch0(), value); | 
| __ swc1(double_scratch0(), MemOperand(address, base_offset)); | 
| } else {  // Storing doubles, not floats. | 
| @@ -4499,30 +4482,21 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { | 
| element_size_shift, shift_size, | 
| base_offset); | 
| switch (elements_kind) { | 
| -      case EXTERNAL_UINT8_CLAMPED_ELEMENTS: | 
| -      case EXTERNAL_INT8_ELEMENTS: | 
| -      case EXTERNAL_UINT8_ELEMENTS: | 
| case UINT8_ELEMENTS: | 
| case UINT8_CLAMPED_ELEMENTS: | 
| case INT8_ELEMENTS: | 
| __ sb(value, mem_operand); | 
| break; | 
| -      case EXTERNAL_INT16_ELEMENTS: | 
| -      case EXTERNAL_UINT16_ELEMENTS: | 
| case INT16_ELEMENTS: | 
| case UINT16_ELEMENTS: | 
| __ sh(value, mem_operand); | 
| break; | 
| -      case EXTERNAL_INT32_ELEMENTS: | 
| -      case EXTERNAL_UINT32_ELEMENTS: | 
| case INT32_ELEMENTS: | 
| case UINT32_ELEMENTS: | 
| __ sw(value, mem_operand); | 
| break; | 
| case FLOAT32_ELEMENTS: | 
| case FLOAT64_ELEMENTS: | 
| -      case EXTERNAL_FLOAT32_ELEMENTS: | 
| -      case EXTERNAL_FLOAT64_ELEMENTS: | 
| case FAST_DOUBLE_ELEMENTS: | 
| case FAST_ELEMENTS: | 
| case FAST_SMI_ELEMENTS: | 
| @@ -4649,7 +4623,7 @@ void LCodeGen::DoStoreKeyedFixedArray(LStoreKeyed* instr) { | 
|  | 
| void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) { | 
| // By cases: external, fast double | 
| -  if (instr->is_typed_elements()) { | 
| +  if (instr->is_fixed_typed_array()) { | 
| DoStoreKeyedExternalArray(instr); | 
| } else if (instr->hydrogen()->value()->representation().IsDouble()) { | 
| DoStoreKeyedFixedDoubleArray(instr); | 
|  |