Reviewers: mvstanton,
Description:
Merged r17241 into trunk branch.
Revert "TransitionAndStoreStub bailout needs to transition (and store)."
[email protected]
Please review this at https://codereview.chromium.org/27165003/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files (+2, -11 lines):
M src/ic.cc
M src/version.cc
M test/mjsunit/allocation-site-info.js
Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index
da6e9c69eafcb6fb5712f73ed5f4d9580e70049a..a6ffb13ad40a84b16073b7d6b8a4bbb43ab7e702
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<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,
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
4abe6b37e0a80dfab2b1799851cf3f90bdd0db6c..d0ee131fe2d29895b63345cd9891b8f0b3a98dd9
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 22
#define BUILD_NUMBER 13
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/allocation-site-info.js
diff --git a/test/mjsunit/allocation-site-info.js
b/test/mjsunit/allocation-site-info.js
index
626696be15828ea10f66ba2f153a71824f84c0b1..f32344a405331e5bdbc801ba683c637d8a07943f
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.
--
--
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.
