| Index: src/arm/lithium-arm.cc
 | 
| diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
 | 
| index 30d7a1c2cd805d5029f8787fdce929fd2b5f6275..aaa970a5898d98f9b34922d36945f0805430182e 100644
 | 
| --- a/src/arm/lithium-arm.cc
 | 
| +++ b/src/arm/lithium-arm.cc
 | 
| @@ -1860,15 +1860,15 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement(
 | 
|  
 | 
|  LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement(
 | 
|      HLoadKeyedSpecializedArrayElement* instr) {
 | 
| -  JSObject::ElementsKind elements_kind = instr->elements_kind();
 | 
| +  ElementsKind elements_kind = instr->elements_kind();
 | 
|    Representation representation(instr->representation());
 | 
|    ASSERT(
 | 
|        (representation.IsInteger32() &&
 | 
| -       (elements_kind != JSObject::EXTERNAL_FLOAT_ELEMENTS) &&
 | 
| -       (elements_kind != JSObject::EXTERNAL_DOUBLE_ELEMENTS)) ||
 | 
| +       (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
 | 
| +       (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
 | 
|        (representation.IsDouble() &&
 | 
| -       ((elements_kind == JSObject::EXTERNAL_FLOAT_ELEMENTS) ||
 | 
| -       (elements_kind == JSObject::EXTERNAL_DOUBLE_ELEMENTS))));
 | 
| +       ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
 | 
| +       (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
 | 
|    ASSERT(instr->key()->representation().IsInteger32());
 | 
|    LOperand* external_pointer = UseRegister(instr->external_pointer());
 | 
|    LOperand* key = UseRegisterOrConstant(instr->key());
 | 
| @@ -1877,7 +1877,7 @@ LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement(
 | 
|    LInstruction* load_instr = DefineAsRegister(result);
 | 
|    // An unsigned int array load might overflow and cause a deopt, make sure it
 | 
|    // has an environment.
 | 
| -  return (elements_kind == JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS) ?
 | 
| +  return (elements_kind == EXTERNAL_UNSIGNED_INT_ELEMENTS) ?
 | 
|        AssignEnvironment(load_instr) : load_instr;
 | 
|  }
 | 
|  
 | 
| @@ -1928,21 +1928,21 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement(
 | 
|  LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement(
 | 
|      HStoreKeyedSpecializedArrayElement* instr) {
 | 
|    Representation representation(instr->value()->representation());
 | 
| -  JSObject::ElementsKind elements_kind = instr->elements_kind();
 | 
| +  ElementsKind elements_kind = instr->elements_kind();
 | 
|    ASSERT(
 | 
|        (representation.IsInteger32() &&
 | 
| -       (elements_kind != JSObject::EXTERNAL_FLOAT_ELEMENTS) &&
 | 
| -       (elements_kind != JSObject::EXTERNAL_DOUBLE_ELEMENTS)) ||
 | 
| +       (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
 | 
| +       (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
 | 
|        (representation.IsDouble() &&
 | 
| -       ((elements_kind == JSObject::EXTERNAL_FLOAT_ELEMENTS) ||
 | 
| -       (elements_kind == JSObject::EXTERNAL_DOUBLE_ELEMENTS))));
 | 
| +       ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
 | 
| +       (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
 | 
|    ASSERT(instr->external_pointer()->representation().IsExternal());
 | 
|    ASSERT(instr->key()->representation().IsInteger32());
 | 
|  
 | 
|    LOperand* external_pointer = UseRegister(instr->external_pointer());
 | 
|    bool val_is_temp_register =
 | 
| -      elements_kind == JSObject::EXTERNAL_PIXEL_ELEMENTS ||
 | 
| -      elements_kind == JSObject::EXTERNAL_FLOAT_ELEMENTS;
 | 
| +      elements_kind == EXTERNAL_PIXEL_ELEMENTS ||
 | 
| +      elements_kind == EXTERNAL_FLOAT_ELEMENTS;
 | 
|    LOperand* val = val_is_temp_register
 | 
|        ? UseTempRegister(instr->value())
 | 
|        : UseRegister(instr->value());
 | 
| 
 |