Revert of Remove ExternalArray, derived types, and element kinds

src/x64/lithium-x64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_X64
 
@@ skipping 2223 matching lines @@
         instr->key()->representation(), elements_kind);
     key = clobbers_key
         ? UseTempRegister(instr->key())
         : UseRegisterOrConstantAtStart(instr->key());
   }
 
   if ((kPointerSize == kInt64Size) && instr->IsDehoisted()) {
     FindDehoistedKeyDefinitions(instr->key());
   }
 
-  if (!instr->is_fixed_typed_array()) {
+  if (!instr->is_typed_elements()) {
     LOperand* obj = UseRegisterAtStart(instr->elements());
     result = DefineAsRegister(new(zone()) LLoadKeyed(obj, key));
   } else {
     DCHECK(
         (instr->representation().IsInteger32() &&
          !(IsDoubleOrFloatElementsKind(elements_kind))) ||
         (instr->representation().IsDouble() &&
          (IsDoubleOrFloatElementsKind(elements_kind))));
     LOperand* backing_store = UseRegister(instr->elements());
     result = DefineAsRegister(new(zone()) LLoadKeyed(backing_store, key));
   }
 
   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
     // LCodeGen::DoLoadKeyedFixedArray
     needs_environment =
         instr->RequiresHoleCheck() ||
         (instr->hole_mode() == CONVERT_HOLE_TO_UNDEFINED && info()->IsStub());
   }
 
   if (needs_environment) {
@@ skipping 19 matching lines @@
 }
 
 
 LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
   ElementsKind elements_kind = instr->elements_kind();
 
   if ((kPointerSize == kInt64Size) && instr->IsDehoisted()) {
     FindDehoistedKeyDefinitions(instr->key());
   }
 
-  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;
     LOperand* key = NULL;
     LOperand* val = NULL;
 
     Representation value_representation = instr->value()->representation();
     if (value_representation.IsDouble()) {
       object = UseRegisterAtStart(instr->elements());
       val = UseRegisterAtStart(instr->value());
@@ skipping 14 matching lines @@
 
     return new(zone()) LStoreKeyed(object, key, val);
   }
 
   DCHECK(
        (instr->value()->representation().IsInteger32() &&
        !IsDoubleOrFloatElementsKind(elements_kind)) ||
        (instr->value()->representation().IsDouble() &&
        IsDoubleOrFloatElementsKind(elements_kind)));
   DCHECK(instr->elements()->representation().IsExternal());
-  bool val_is_temp_register = elements_kind == UINT8_CLAMPED_ELEMENTS ||
-                              elements_kind == FLOAT32_ELEMENTS;
+  bool val_is_temp_register =
+      elements_kind == EXTERNAL_UINT8_CLAMPED_ELEMENTS ||
+      elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
+      elements_kind == FLOAT32_ELEMENTS;
   LOperand* val = val_is_temp_register ? UseTempRegister(instr->value())
       : UseRegister(instr->value());
   LOperand* key = NULL;
   if (kPointerSize == kInt64Size) {
     key = UseRegisterOrConstantAtStart(instr->key());
   } else {
     bool clobbers_key = ExternalArrayOpRequiresTemp(
         instr->key()->representation(), elements_kind);
     key = clobbers_key
         ? UseTempRegister(instr->key())
@@ skipping 419 matching lines @@
   LAllocateBlockContext* result =
       new(zone()) LAllocateBlockContext(context, function);
   return MarkAsCall(DefineFixed(result, rsi), instr);
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64