[v8-dev] Add support for dictionary elements to polymorphic crankshaft code. (issue7285001)

Wed, 29 Jun 2011 06:54:28 -0700 

Reviewers: danno,

Message:
PTAL.

Description:
Add support for dictionary elements to polymorphic crankshaft code.


Please review this at http://codereview.chromium.org/7285001/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/hydrogen.cc
  M src/ic.cc
  M src/objects.h
  M src/stub-cache.cc


Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index d700fd2e34c65ee621f470242e64b00b789aa9b3..69cec000447f3b55da2c75acc9427a044c6f40b1 100644 
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -3917,8 +3917,6 @@ HValue* HGraphBuilder::HandlePolymorphicElementAccess(HValue* object, 
       todo_external_array = true;
     }
   }
-  // We can't treat dictionary elements here (need to deopt instead).
-  type_todo[JSObject::DICTIONARY_ELEMENTS] = false;
   // Support for FAST_DOUBLE_ELEMENTS isn't implemented yet, so we deopt.
   type_todo[JSObject::FAST_DOUBLE_ELEMENTS] = false;
@@ -3936,9 +3934,10 @@ HValue* HGraphBuilder::HandlePolymorphicElementAccess(HValue* object, 
   for (JSObject::ElementsKind elements_kind = JSObject::FAST_ELEMENTS;
        elements_kind <= JSObject::LAST_ELEMENTS_KIND;
        elements_kind = JSObject::ElementsKind(elements_kind + 1)) {
-    // After having handled FAST_ELEMENTS in the first run of the loop, we
+    // After having handled FAST_ELEMENTS and DICTIONARY_ELEMENTS, we
     // need to add some code that's executed for all other cases.
-    if (elements_kind == 1 && todo_external_array) {
+    if (elements_kind == JSObject::DICTIONARY_ELEMENTS + 1
+        && todo_external_array) {
       elements = AddInstruction(new(zone()) HLoadElements(object));
// We need to forcibly prevent some ElementsKind-dependent instructions 
       // from being hoisted out of any loops they might occur in, because
@@ -4007,6 +4006,12 @@ HValue* HGraphBuilder::HandlePolymorphicElementAccess(HValue* object, 
           access = AddInstruction(
               new(zone()) HLoadKeyedFastElement(elements, checked_key));
         }
+      } else if (elements_kind == JSObject::DICTIONARY_ELEMENTS) {
+        if (is_store) {
+          access = BuildStoreKeyedGeneric(object, key, val);
+        } else {
+          access = BuildLoadKeyedGeneric(object, key);
+        }
       } else {  // External array elements.
         access = AddInstruction(BuildExternalArrayElementAccess(
             external_elements, checked_key, val, elements_kind, is_store));
Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index 542466d1e0153e8d1aa465828255122a140d87f6..ca5ac9d18480de778ef511b1483159f1cd413c7d 100644 
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1747,7 +1747,8 @@ MaybeObject* KeyedIC::ComputeMonomorphicStub(JSObject* receiver, 
                                              Code* generic_stub) {
   Code* result = NULL;
   if (receiver->HasFastElements() ||
-      receiver->HasExternalArrayElements()) {
+      receiver->HasExternalArrayElements() ||
+      receiver->HasDictionaryElements()) {
     MaybeObject* maybe_stub =
         isolate()->stub_cache()->ComputeKeyedLoadOrStoreElement(
             receiver, is_store, strict_mode);
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index c9a0a78ba33882767280a9cb100a33e7ab7a4d30..e75ebfbb022be0abc444f23b16e8bfc10856dedb 100644 
--- a/src/objects.h
+++ b/src/objects.h
@@ -3946,6 +3946,10 @@ class Map: public HeapObject {
         kind <= JSObject::LAST_EXTERNAL_ARRAY_ELEMENTS_KIND;
   }

+  inline bool has_dictionary_elements() {
+    return elements_kind() == JSObject::DICTIONARY_ELEMENTS;
+  }
+
   // Tells whether the map is attached to SharedFunctionInfo
   // (for inobject slack tracking).
   inline void set_attached_to_shared_function_info(bool value);
Index: src/stub-cache.cc
diff --git a/src/stub-cache.cc b/src/stub-cache.cc
index d5392d95bfafa5207ec66e2a26f4a6507aa13d7e..eb813814d42ad3557842b0b0f2572c65fc2167b1 100644 
--- a/src/stub-cache.cc
+++ b/src/stub-cache.cc
@@ -1694,6 +1694,8 @@ MaybeObject* KeyedLoadStubCompiler::ComputeSharedKeyedLoadElementStub( 
   } else if (receiver_map->has_external_array_elements()) {
     JSObject::ElementsKind elements_kind = receiver_map->elements_kind();
     maybe_stub = KeyedLoadExternalArrayStub(elements_kind).TryGetCode();
+  } else if (receiver_map->has_dictionary_elements()) {
+ maybe_stub = isolate()->builtins()->builtin(Builtins::kKeyedLoadIC_Slow); 
   } else {
     UNREACHABLE();
   }
@@ -1746,6 +1748,8 @@ MaybeObject* KeyedStoreStubCompiler::ComputeSharedKeyedStoreElementStub( 
   } else if (receiver_map->has_external_array_elements()) {
     JSObject::ElementsKind elements_kind = receiver_map->elements_kind();
     maybe_stub = KeyedStoreExternalArrayStub(elements_kind).TryGetCode();
+  } else if (receiver_map->has_dictionary_elements()) {
+ maybe_stub = isolate()->builtins()->builtin(Builtins::kKeyedStoreIC_Slow); 
   } else {
     UNREACHABLE();
   }


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to