Revert of Remove ExternalArray, derived types, and element kinds

src/elements-kind.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 "src/elements-kind.h"
 
 #include "src/api.h"
 #include "src/base/lazy-instance.h"
 #include "src/elements.h"
 #include "src/objects.h"
 
 namespace v8 {
 namespace internal {
 
 
 int ElementsKindToShiftSize(ElementsKind elements_kind) {
   switch (elements_kind) {
+    case EXTERNAL_INT8_ELEMENTS:
+    case EXTERNAL_UINT8_CLAMPED_ELEMENTS:
+    case EXTERNAL_UINT8_ELEMENTS:
     case UINT8_ELEMENTS:
     case INT8_ELEMENTS:
     case UINT8_CLAMPED_ELEMENTS:
       return 0;
+    case EXTERNAL_INT16_ELEMENTS:
+    case EXTERNAL_UINT16_ELEMENTS:
     case UINT16_ELEMENTS:
     case INT16_ELEMENTS:
       return 1;
+    case EXTERNAL_INT32_ELEMENTS:
+    case EXTERNAL_UINT32_ELEMENTS:
+    case EXTERNAL_FLOAT32_ELEMENTS:
     case UINT32_ELEMENTS:
     case INT32_ELEMENTS:
     case FLOAT32_ELEMENTS:
       return 2;
+    case EXTERNAL_FLOAT64_ELEMENTS:
     case FAST_DOUBLE_ELEMENTS:
     case FAST_HOLEY_DOUBLE_ELEMENTS:
     case FLOAT64_ELEMENTS:
       return 3;
     case FAST_SMI_ELEMENTS:
     case FAST_ELEMENTS:
     case FAST_HOLEY_SMI_ELEMENTS:
     case FAST_HOLEY_ELEMENTS:
     case DICTIONARY_ELEMENTS:
     case FAST_SLOPPY_ARGUMENTS_ELEMENTS:
     case SLOW_SLOPPY_ARGUMENTS_ELEMENTS:
       return kPointerSizeLog2;
   }
   UNREACHABLE();
   return 0;
 }
 
 
+static bool IsTypedArrayElementsKind(ElementsKind elements_kind) {
+  return IsFixedTypedArrayElementsKind(elements_kind) ||
+         IsExternalArrayElementsKind(elements_kind);
+}
+
+
 int GetDefaultHeaderSizeForElementsKind(ElementsKind elements_kind) {
   STATIC_ASSERT(FixedArray::kHeaderSize == FixedDoubleArray::kHeaderSize);
 
-  if (IsFixedTypedArrayElementsKind(elements_kind)) {
+  if (IsTypedArrayElementsKind(elements_kind)) {
     return 0;
   } else {
     return FixedArray::kHeaderSize - kHeapObjectTag;
   }
 }
 
 
 const char* ElementsKindToString(ElementsKind kind) {
   ElementsAccessor* accessor = ElementsAccessor::ForKind(kind);
   return accessor->name();
@@ skipping 42 matching lines @@
     if (fast_elements_kind_sequence.Get()[i] == elements_kind) {
       return i;
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 ElementsKind GetNextTransitionElementsKind(ElementsKind kind) {
-  int index = GetSequenceIndexFromFastElementsKind(kind);
-  return GetFastElementsKindFromSequenceIndex(index + 1);
+  switch (kind) {
+#define FIXED_TYPED_ARRAY_CASE(Type, type, TYPE, ctype, size) \
+    case TYPE##_ELEMENTS: return EXTERNAL_##TYPE##_ELEMENTS;
+
+    TYPED_ARRAYS(FIXED_TYPED_ARRAY_CASE)
+#undef FIXED_TYPED_ARRAY_CASE
+    default: {
+      int index = GetSequenceIndexFromFastElementsKind(kind);
+      return GetFastElementsKindFromSequenceIndex(index + 1);
+    }
+  }
 }
 
 
 static inline bool IsFastTransitionTarget(ElementsKind elements_kind) {
   return IsFastElementsKind(elements_kind) ||
       elements_kind == DICTIONARY_ELEMENTS;
 }
 
 bool IsMoreGeneralElementsKindTransition(ElementsKind from_kind,
                                          ElementsKind to_kind) {
-  if (IsFixedTypedArrayElementsKind(from_kind) ||
-      IsFixedTypedArrayElementsKind(to_kind)) {
-    return false;
+  if (IsTypedArrayElementsKind(from_kind) ||
+      IsTypedArrayElementsKind(to_kind)) {
+    switch (from_kind) {
+#define FIXED_TYPED_ARRAY_CASE(Type, type, TYPE, ctype, size) \
+      case TYPE##_ELEMENTS:                                   \
+        return to_kind == EXTERNAL_##TYPE##_ELEMENTS;
+
+      TYPED_ARRAYS(FIXED_TYPED_ARRAY_CASE);
+#undef FIXED_TYPED_ARRAY_CASE
+      default:
+        return false;
+    }
   }
   if (IsFastElementsKind(from_kind) && IsFastTransitionTarget(to_kind)) {
     switch (from_kind) {
       case FAST_SMI_ELEMENTS:
         return to_kind != FAST_SMI_ELEMENTS;
       case FAST_HOLEY_SMI_ELEMENTS:
         return to_kind != FAST_SMI_ELEMENTS &&
             to_kind != FAST_HOLEY_SMI_ELEMENTS;
       case FAST_DOUBLE_ELEMENTS:
         return to_kind != FAST_SMI_ELEMENTS &&
             to_kind != FAST_HOLEY_SMI_ELEMENTS &&
             to_kind != FAST_DOUBLE_ELEMENTS;
       case FAST_HOLEY_DOUBLE_ELEMENTS:
         return to_kind == FAST_ELEMENTS ||
             to_kind == FAST_HOLEY_ELEMENTS;
       case FAST_ELEMENTS:
         return to_kind == FAST_HOLEY_ELEMENTS;
       case FAST_HOLEY_ELEMENTS:
         return false;
       default:
         return false;
     }
   }
   return false;
 }
 
 
 }  // namespace internal
 }  // namespace v8