Plumbing changes to merge various element kind implementaions.

src/type-info.cc

Index: src/type-info.cc
diff --git a/src/type-info.cc b/src/type-info.cc
index f5d2afbe5c2a1251294112439557966c0885448e..c45a106fe6a37fe27e2162a12d525916b3945f4c 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -171,18 +171,18 @@ CheckType TypeFeedbackOracle::GetCallCheckType(Call* expr) {
   return check;
 }
 
-ExternalArrayType TypeFeedbackOracle::GetKeyedLoadExternalArrayType(
+JSObject::ElementsKind TypeFeedbackOracle::GetKeyedLoadElementsKind(

[Jakob Kummerow, 2011/06/09 14:26:40]

See the comment in type-info.h -- I think you can remove
GetKeyed{Load,Store}ElementsKind().

[danno, 2011/06/09 15:03:27]

Done.

     Property* expr) {
   Handle<Object> stub = GetInfo(expr->id());
   ASSERT(stub->IsCode());
-  return Code::cast(*stub)->external_array_type();
+  return Code::cast(*stub)->FindFirstMap()->elements_kind();
 }
 
-ExternalArrayType TypeFeedbackOracle::GetKeyedStoreExternalArrayType(
+JSObject::ElementsKind TypeFeedbackOracle::GetKeyedStoreElementsKind(
     Expression* expr) {
   Handle<Object> stub = GetInfo(expr->id());
   ASSERT(stub->IsCode());
-  return Code::cast(*stub)->external_array_type();
+  return Code::cast(*stub)->FindFirstMap()->elements_kind();
 }
 
 Handle<JSObject> TypeFeedbackOracle::GetPrototypeForPrimitiveCheck(