Rollback of r11638, r11636 on trunk branch.

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 16 matching lines @@
 
 // Flags: --allow-natives-syntax --smi-only-arrays --expose-gc
 
 // 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));
+support_smi_only_arrays = %HasFastSmiOnlyElements(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_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 (%HasFastSmiOnlyElements(obj)) return elements_kind.fast_smi_only;
+  if (%HasFastElements(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 (%HasExternalByteElements(obj)) {
     return elements_kind.external_byte;
   }
   if (%HasExternalUnsignedByteElements(obj)) {
     return elements_kind.external_unsigned_byte;
   }
@@ skipping 35 matching lines @@
 assertKind(elements_kind.fast, me);
 
 if (support_smi_only_arrays) {
   var too = [1,2,3];
   assertKind(elements_kind.fast_smi_only, too);
   too.dance = 0xD15C0;
   too.drink = 0xC0C0A;
   assertKind(elements_kind.fast_smi_only, too);
 }
 
-// Make sure the element kind transitions from smi when a non-smi is stored.
+// Make sure the element kind transitions from smionly when a non-smi is stored.
 var you = new Array();
 assertKind(elements_kind.fast_smi_only, you);
 for (var i = 0; i < 1337; i++) {
   var val = i;
   if (i == 1336) {
     assertKind(elements_kind.fast_smi_only, you);
     val = new Object();
   }
   you[i] = val;
 }
@@ skipping 207 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();