From 3e0f828b8ff555c24ad033a0c3a29d528d9f6b55 Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Wed, 16 Oct 2013 14:17:31 +0000 Subject: [PATCH] Revert "TransitionAndStoreStub bailout needs to transition (and store)." This reverts commit r17216 breaking fast/js/cross-frame-bad-time.html test. R=mvstanton@chromium.org TEST=webkit:fast/js/cross-frame-bad-time.html Review URL: https://codereview.chromium.org/27516002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17241 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ic.cc | 5 ----- test/mjsunit/allocation-site-info.js | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/ic.cc b/src/ic.cc index da6e9c69e..a6ffb13ad 100644 --- a/src/ic.cc +++ b/src/ic.cc @@ -2257,14 +2257,9 @@ RUNTIME_FUNCTION(MaybeObject*, ElementsTransitionAndStoreIC_Miss) { ASSERT(args.length() == 4); KeyedStoreIC ic(IC::EXTRA_CALL_FRAME, isolate); Handle value = args.at(0); - Handle map = args.at(1); Handle key = args.at(2); Handle object = args.at(3); StrictModeFlag strict_mode = ic.strict_mode(); - if (object->IsJSObject()) { - JSObject::TransitionElementsKind(Handle::cast(object), - map->elements_kind()); - } return Runtime::SetObjectProperty(isolate, object, key, diff --git a/test/mjsunit/allocation-site-info.js b/test/mjsunit/allocation-site-info.js index 626696be1..f32344a40 100644 --- a/test/mjsunit/allocation-site-info.js +++ b/test/mjsunit/allocation-site-info.js @@ -148,12 +148,8 @@ if (support_smi_only_arrays) { 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. -- 2.34.1