Revert "This implements allocating small typed arrays in heap."

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
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (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 --smi-only-arrays --expose-gc --nostress-opt --typed-array-max_size_in-heap=2048
+// Flags: --allow-natives-syntax --smi-only-arrays --expose-gc --nostress-opt
 
 // Test element kind of objects.
 // Since --smi-only-arrays affects builtins, its default setting at compile
 // time sticks if built with snapshot.  If --smi-only-arrays is deactivated
 // by default, only a no-snapshot build actually has smi-only arrays enabled
 // in this test case.  Depending on whether smi-only arrays are actually
 // enabled, this test takes the appropriate code path to check smi-only arrays.
 
 support_smi_only_arrays = %HasFastSmiElements(new Array(1,2,3,4,5,6,7,8));
 
 if (support_smi_only_arrays) {
   print("Tests include smi-only arrays.");
 } else {
   print("Tests do NOT include smi-only arrays.");
 }
 
 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'
+  fast_smi_only            :  'fast smi only elements',
+  fast                     :  'fast elements',
+  fast_double              :  'fast double elements',
+  dictionary               :  'dictionary elements',
+  external_byte            :  'external byte elements',
+  external_unsigned_byte   :  'external unsigned byte elements',
+  external_short           :  'external short elements',
+  external_unsigned_short  :  'external unsigned short elements',
+  external_int             :  'external int elements',
+  external_unsigned_int    :  'external unsigned int elements',
+  external_float           :  'external float elements',
+  external_double          :  'external double elements',
+  external_pixel           :  'external pixel 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.
+  assertTrue(%HasExternalArrayElements(obj));
   if (%HasExternalInt8Elements(obj)) {
-    return elements_kind.external_int8;
+    return elements_kind.external_byte;
   }
   if (%HasExternalUint8Elements(obj)) {
-    return elements_kind.external_uint8;
+    return elements_kind.external_unsigned_byte;
   }
   if (%HasExternalInt16Elements(obj)) {
-    return elements_kind.external_int16;
+    return elements_kind.external_short;
   }
   if (%HasExternalUint16Elements(obj)) {
-    return elements_kind.external_uint16;
+    return elements_kind.external_unsigned_short;
   }
   if (%HasExternalInt32Elements(obj)) {
-    return elements_kind.external_int32;
+    return elements_kind.external_int;
   }
   if (%HasExternalUint32Elements(obj)) {
-    return elements_kind.external_uint32;
+    return elements_kind.external_unsigned_int;
   }
   if (%HasExternalFloat32Elements(obj)) {
-    return elements_kind.external_float32;
+    return elements_kind.external_float;
   }
   if (%HasExternalFloat64Elements(obj)) {
-    return elements_kind.external_float64;
+    return elements_kind.external_double;
   }
   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)) {
-    return elements_kind.fixed_uint16;
-  }
-  if (%HasFixedInt32Elements(obj)) {
-    return elements_kind.fixed_int32;
-  }
-  if (%HasFixedUint32Elements(obj)) {
-    return elements_kind.fixed_uint32;
-  }
-  if (%HasFixedFloat32Elements(obj)) {
-    return elements_kind.fixed_float32;
-  }
-  if (%HasFixedFloat64Elements(obj)) {
-    return elements_kind.fixed_float64;
-  }
-  if (%HasFixedUint8ClampedElements(obj)) {
-    return elements_kind.fixed_uint8_clamped;
+    return elements_kind.external_pixel;
   }
 }
 
 function assertKind(expected, obj, name_opt) {
   if (!support_smi_only_arrays &&
       expected == elements_kind.fast_smi_only) {
     expected = elements_kind.fast;
   }
   assertEquals(expected, getKind(obj), name_opt);
 }
@@ skipping 25 matching lines @@
     you[i] = val;
   }
   assertKind(elements_kind.fast, you);
 
   assertKind(elements_kind.dictionary, new Array(0xDECAF));
 
   var fast_double_array = new Array(0xDECAF);
   for (var i = 0; i < 0xDECAF; i++) fast_double_array[i] = i / 2;
   assertKind(elements_kind.fast_double, fast_double_array);
 
-  assertKind(elements_kind.fixed_int8,    new Int8Array(007));
-  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.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));
+  assertKind(elements_kind.external_byte,           new Int8Array(9001));
+  assertKind(elements_kind.external_unsigned_byte,  new Uint8Array(007));
+  assertKind(elements_kind.external_short,          new Int16Array(666));
+  assertKind(elements_kind.external_unsigned_short, new Uint16Array(42));
+  assertKind(elements_kind.external_int,            new Int32Array(0xF));
+  assertKind(elements_kind.external_unsigned_int,   new Uint32Array(23));
+  assertKind(elements_kind.external_float,          new Float32Array(7));
+  assertKind(elements_kind.external_double,         new Float64Array(0));
+  assertKind(elements_kind.external_pixel,          new Uint8ClampedArray(512));
 
   // 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 205 matching lines @@
   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();