Plumbing changes to merge various element kind implementaions.

src/lithium.cc

Index: src/lithium.cc
diff --git a/src/lithium.cc b/src/lithium.cc
index 62b263be114698796fd2ec314404d35471aa490e..dffec4600fdb49425222fb5b498f19078f48fa8a 100644
--- a/src/lithium.cc
+++ b/src/lithium.cc
@@ -166,21 +166,25 @@ void LPointerMap::PrintTo(StringStream* stream) {
 }
 
 
-int ExternalArrayTypeToShiftSize(ExternalArrayType type) {
-  switch (type) {
-    case kExternalByteArray:
-    case kExternalUnsignedByteArray:
-    case kExternalPixelArray:
+int ElementsKindToShiftSize(JSObject::ElementsKind elements_kind) {
+  switch (elements_kind) {
+    case JSObject::EXTERNAL_BYTE_ELEMENTS:
+    case JSObject::EXTERNAL_PIXEL_ELEMENTS:
+    case JSObject::EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
       return 0;
-    case kExternalShortArray:
-    case kExternalUnsignedShortArray:
+    case JSObject::EXTERNAL_SHORT_ELEMENTS:
+    case JSObject::EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
       return 1;
-    case kExternalIntArray:
-    case kExternalUnsignedIntArray:
-    case kExternalFloatArray:
+    case JSObject::EXTERNAL_INT_ELEMENTS:
+    case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
+    case JSObject::EXTERNAL_FLOAT_ELEMENTS:
       return 2;
-    case kExternalDoubleArray:
+    case JSObject::EXTERNAL_DOUBLE_ELEMENTS:
       return 3;
+    case JSObject::FAST_ELEMENTS:
+    case JSObject::FAST_DOUBLE_ELEMENTS:

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

FAST_DOUBLE_ELEMENTS should return 3

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

Done.

+    case JSObject::DICTIONARY_ELEMENTS:
+      return kPointerSizeLog2;

[Mads Ager (chromium), 2011/06/09 14:15:45]

For DoubleElements you should multiply by the size of a double and not by the
size of a pointer, right? Or am I missing something in the way this is used?

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

Not used yet, but you're right,

On 2011/06/09 14:15:45, Mads Ager wrote:

   }
   UNREACHABLE();
   return 0;