Revision: 17241
Author:   [email protected]
Date:     Wed Oct 16 14:17:31 2013 UTC
Log: Revert "TransitionAndStoreStub bailout needs to transition (and store)."

This reverts commit r17216 breaking fast/js/cross-frame-bad-time.html test.

[email protected]
TEST=webkit:fast/js/cross-frame-bad-time.html

Review URL: https://codereview.chromium.org/27516002
http://code.google.com/p/v8/source/detail?r=17241

Modified:
 /branches/bleeding_edge/src/ic.cc
 /branches/bleeding_edge/test/mjsunit/allocation-site-info.js

=======================================
--- /branches/bleeding_edge/src/ic.cc   Tue Oct 15 12:42:03 2013 UTC
+++ /branches/bleeding_edge/src/ic.cc   Wed Oct 16 14:17:31 2013 UTC
@@ -2257,14 +2257,9 @@
   ASSERT(args.length() == 4);
   KeyedStoreIC ic(IC::EXTRA_CALL_FRAME, isolate);
   Handle<Object> value = args.at<Object>(0);
-  Handle<Map> map = args.at<Map>(1);
   Handle<Object> key = args.at<Object>(2);
   Handle<Object> object = args.at<Object>(3);
   StrictModeFlag strict_mode = ic.strict_mode();
-  if (object->IsJSObject()) {
-    JSObject::TransitionElementsKind(Handle<JSObject>::cast(object),
-                                     map->elements_kind());
-  }
   return Runtime::SetObjectProperty(isolate,
                                     object,
                                     key,
=======================================
--- /branches/bleeding_edge/test/mjsunit/allocation-site-info.js Wed Oct 16 08:10:36 2013 UTC +++ /branches/bleeding_edge/test/mjsunit/allocation-site-info.js Wed Oct 16 14:17:31 2013 UTC
@@ -148,12 +148,8 @@
     assertKind(elements_kind.fast_double, obj);
     obj = fastliteralcase([3, 6, 2], 1.5);
     assertKind(elements_kind.fast_double, obj);
-
-    // Note: thanks to pessimistic transition store stubs, we'll attempt
-    // to transition to the most general elements kind seen at a particular
-    // store site. So, the elements kind will be double.
     obj = fastliteralcase([2, 6, 3], 2);
-    assertKind(elements_kind.fast_double, obj);
+    assertKind(elements_kind.fast_smi_only, obj);
   }

   // Verify that we will not pretransition the double->fast path.

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to