Plumbing changes to merge various element kind implementaions.

src/type-info.cc

 // Copyright 2011 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 153 matching lines @@
 
 
 CheckType TypeFeedbackOracle::GetCallCheckType(Call* expr) {
   Handle<Object> value = GetInfo(expr->id());
   if (!value->IsSmi()) return RECEIVER_MAP_CHECK;
   CheckType check = static_cast<CheckType>(Smi::cast(*value)->value());
   ASSERT(check != RECEIVER_MAP_CHECK);
   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(
     CheckType check) {
   JSFunction* function = NULL;
   switch (check) {
     case RECEIVER_MAP_CHECK:
       UNREACHABLE();
       break;
     case STRING_CHECK:
@@ skipping 300 matching lines @@
           static_cast<int>(info->pc() - code->instruction_start()));
       ASSERT(ast_ids->length() == 0 ||
              (*ast_ids)[ast_ids->length()-1] !=
              static_cast<unsigned>(info->data()));
       ast_ids->Add(static_cast<unsigned>(info->data()));
     }
   }
 }
 
 } }  // namespace v8::internal