Revert of Remove ExternalArray, derived types, and element kinds

test/mjsunit/elements-kind.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 14 matching lines @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax --expose-gc --nostress-opt --typed-array-max-size-in-heap=2048
 
 var elements_kind = {
   fast_smi_only             :  'fast smi only elements',
   fast                      :  'fast elements',
   fast_double               :  'fast double elements',
   dictionary                :  'dictionary elements',
+  external_int32            :  'external int8 elements',
+  external_uint8            :  'external uint8 elements',
+  external_int16            :  'external int16 elements',
+  external_uint16           :  'external uint16 elements',
+  external_int32            :  'external int32 elements',
+  external_uint32           :  'external uint32 elements',
+  external_float32          :  'external float32 elements',
+  external_float64          :  'external float64 elements',
+  external_uint8_clamped    :  'external uint8_clamped elements',
   fixed_int32               :  'fixed int8 elements',
   fixed_uint8               :  'fixed uint8 elements',
   fixed_int16               :  'fixed int16 elements',
   fixed_uint16              :  'fixed uint16 elements',
   fixed_int32               :  'fixed int32 elements',
   fixed_uint32              :  'fixed uint32 elements',
   fixed_float32             :  'fixed float32 elements',
   fixed_float64             :  'fixed float64 elements',
   fixed_uint8_clamped       :  'fixed uint8_clamped elements'
 }
 
 function getKind(obj) {
   if (%HasFastSmiElements(obj)) return elements_kind.fast_smi_only;
   if (%HasFastObjectElements(obj)) return elements_kind.fast;
   if (%HasFastDoubleElements(obj)) return elements_kind.fast_double;
   if (%HasDictionaryElements(obj)) return elements_kind.dictionary;
 
+  // Every external kind is also an external array.
+  if (%HasExternalInt8Elements(obj)) {
+    return elements_kind.external_int8;
+  }
+  if (%HasExternalUint8Elements(obj)) {
+    return elements_kind.external_uint8;
+  }
+  if (%HasExternalInt16Elements(obj)) {
+    return elements_kind.external_int16;
+  }
+  if (%HasExternalUint16Elements(obj)) {
+    return elements_kind.external_uint16;
+  }
+  if (%HasExternalInt32Elements(obj)) {
+    return elements_kind.external_int32;
+  }
+  if (%HasExternalUint32Elements(obj)) {
+    return elements_kind.external_uint32;
+  }
+  if (%HasExternalFloat32Elements(obj)) {
+    return elements_kind.external_float32;
+  }
+  if (%HasExternalFloat64Elements(obj)) {
+    return elements_kind.external_float64;
+  }
+  if (%HasExternalUint8ClampedElements(obj)) {
+    return elements_kind.external_uint8_clamped;
+  }
   if (%HasFixedInt8Elements(obj)) {
     return elements_kind.fixed_int8;
   }
   if (%HasFixedUint8Elements(obj)) {
     return elements_kind.fixed_uint8;
   }
   if (%HasFixedInt16Elements(obj)) {
     return elements_kind.fixed_int16;
   }
   if (%HasFixedUint16Elements(obj)) {
@@ skipping 58 matching lines @@
   assertKind(elements_kind.fixed_uint8,   new Uint8Array(007));
   assertKind(elements_kind.fixed_int16,   new Int16Array(666));
   assertKind(elements_kind.fixed_uint16,  new Uint16Array(42));
   assertKind(elements_kind.fixed_int32,   new Int32Array(0xF));
   assertKind(elements_kind.fixed_uint32,  new Uint32Array(23));
   assertKind(elements_kind.fixed_float32, new Float32Array(7));
   assertKind(elements_kind.fixed_float64, new Float64Array(0));
   assertKind(elements_kind.fixed_uint8_clamped, new Uint8ClampedArray(512));
 
   var ab = new ArrayBuffer(128);
-  assertKind(elements_kind.fixed_int8,    new Int8Array(ab));
-  assertKind(elements_kind.fixed_uint8,   new Uint8Array(ab));
-  assertKind(elements_kind.fixed_int16,   new Int16Array(ab));
-  assertKind(elements_kind.fixed_uint16,  new Uint16Array(ab));
-  assertKind(elements_kind.fixed_int32,   new Int32Array(ab));
-  assertKind(elements_kind.fixed_uint32,  new Uint32Array(ab));
-  assertKind(elements_kind.fixed_float32, new Float32Array(ab));
-  assertKind(elements_kind.fixed_float64, new Float64Array(ab));
-  assertKind(elements_kind.fixed_uint8_clamped, new Uint8ClampedArray(ab));
+  assertKind(elements_kind.external_int8,    new Int8Array(ab));
+  assertKind(elements_kind.external_uint8,   new Uint8Array(ab));
+  assertKind(elements_kind.external_int16,   new Int16Array(ab));
+  assertKind(elements_kind.external_uint16,  new Uint16Array(ab));
+  assertKind(elements_kind.external_int32,   new Int32Array(ab));
+  assertKind(elements_kind.external_uint32,  new Uint32Array(ab));
+  assertKind(elements_kind.external_float32, new Float32Array(ab));
+  assertKind(elements_kind.external_float64, new Float64Array(ab));
+  assertKind(elements_kind.external_uint8_clamped, new Uint8ClampedArray(ab));
 
   // Crankshaft support for smi-only array elements.
   function monomorphic(array) {
     assertKind(elements_kind.fast_smi_only, array);
     for (var i = 0; i < 3; i++) {
       array[i] = i + 10;
     }
     assertKind(elements_kind.fast_smi_only, array);
     for (var i = 0; i < 3; i++) {
       var a = array[i];
@@ skipping 191 matching lines @@
 // Test that Array.splice() and Array.slice() return correct ElementsKinds.
 var a = ["foo", "bar"];
 assertKind(elements_kind.fast, a);
 var b = a.splice(0, 1);
 assertKind(elements_kind.fast, b);
 var c = a.slice(0, 1);
 assertKind(elements_kind.fast, c);
 
 // Throw away type information in the ICs for next stress run.
 gc();