Revert 9111036: Promote double arrays to FAST_ELEMENT that use generic KeyedLoadIC

It tanked Kraken.

TBR=jkummerow@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9368024

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10659 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/ic.cc b/src/ic.cc
index c7215409aa8b48ebe54fb2ccb611ebd0f84d2306..9122294bee2f3cca32d3eea2e2b363e1f2c988ae 100644 (file)
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1145,17 +1145,6 @@ MaybeObject* KeyedLoadIC::Load(State state,
         } else if (key->IsSmi() && (target() != *non_strict_arguments_stub())) {
           stub = ComputeStub(receiver, LOAD, kNonStrictMode, stub);
         }
-        // If the IC is being replaced by the generic stub, loads from
-        // FAST_DOUBLE_ELEMENTS arrays will cause unboxing in Crankshafted
-        // code. To prevent these expensive allocations, proactively promote
-        // arrays to FAST_ELEMENTS ElementKinds.
-        if (*stub == *generic_stub()) {
-          if (receiver->HasFastDoubleElements()) {
-            MaybeObject* maybe_object =
-                receiver->TransitionElementsKind(FAST_ELEMENTS);
-            if (maybe_object->IsFailure()) return maybe_object;
-          }
-        }
       }
     } else {
       TRACE_GENERIC_IC("KeyedLoadIC", "force generic");

diff --git a/src/runtime.cc b/src/runtime.cc
index 1ecc724849a5f1bbedf4082794f4b49af639e4ef..80ea7f4b6f0f27dbad94b90799747017e69466b6 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -4271,24 +4271,14 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_KeyedGetProperty) {
           // If value is the hole do the general lookup.
         }
       }
-    } else if (args.at<Object>(1)->IsSmi()) {
-      // Getting properties from FAST_DOUBLE_ELEMENTS arrays causes boxing. To
-      // proactively avoid excessive boxing, transition FAST_DOUBLE_ELEMENTS
-      // arrays to FAST_ELEMENTS if they are accessed via this function, which
-      // is called by the KeyedLoadIC::GenericStub.
-      Handle<JSObject> js_object(args.at<JSObject>(0));
-      if (js_object->HasFastDoubleElements()) {
-        MaybeObject* maybe_object =
-            js_object->TransitionElementsKind(FAST_ELEMENTS);
-        if (maybe_object->IsFailure()) return maybe_object;
-      }
-
+    } else if (FLAG_smi_only_arrays && args.at<Object>(1)->IsSmi()) {
       // JSObject without a string key. If the key is a Smi, check for a
       // definite out-of-bounds access to elements, which is a strong indicator
       // that subsequent accesses will also call the runtime. Proactively
       // transition elements to FAST_ELEMENTS to avoid excessive boxing of
       // doubles for those future calls in the case that the elements would
       // become FAST_DOUBLE_ELEMENTS.
+      Handle<JSObject> js_object(args.at<JSObject>(0));
       ElementsKind elements_kind = js_object->GetElementsKind();
       if (elements_kind == FAST_SMI_ONLY_ELEMENTS ||
           elements_kind == FAST_DOUBLE_ELEMENTS) {