Rollback of r11638, r11636 on trunk branch.

src/bootstrapper.cc

Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index a20f87b122cda6954667cb88e20d1c40a5e7e51a..048a027349ce5316bb2e9f45fdc72be69efd20ef 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -1092,7 +1092,7 @@ bool Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
 
     // Check the state of the object.
     ASSERT(result->HasFastProperties());
-    ASSERT(result->HasFastObjectElements());
+    ASSERT(result->HasFastElements());
 #endif
   }
 
@@ -1185,7 +1185,7 @@ bool Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
 
     // Check the state of the object.
     ASSERT(result->HasFastProperties());
-    ASSERT(result->HasFastObjectElements());
+    ASSERT(result->HasFastElements());
 #endif
   }
 
@@ -1635,7 +1635,7 @@ bool Genesis::InstallNatives() {
         array_function->initial_map()->CopyDropTransitions();
     Map* new_map;
     if (!maybe_map->To<Map>(&new_map)) return false;
-    new_map->set_elements_kind(FAST_HOLEY_ELEMENTS);
+    new_map->set_elements_kind(FAST_ELEMENTS);
     array_function->set_initial_map(new_map);
 
     // Make "length" magic on instances.