From a1f3c9407ff62a943f0235ac2e74f93b506f20e3 Mon Sep 17 00:00:00 2001 From: "svenpanne@chromium.org" Date: Thu, 23 Feb 2012 12:12:28 +0000 Subject: [PATCH] When redefining accessor properties, defensively copy AccessorPairs. The previous code relied on the tricky global invariant that there is no map sharing when accessor properties are involved (or in other words: that TransformToFastProperties is dumb enough :-). Although this is not a real problem with the current code, this assumption breaks when map sharing in fast mode is enabled, so we defensively copy an AccessorPair. Review URL: https://chromiumcodereview.appspot.com/9430048 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10810 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/objects.cc b/src/objects.cc index 17d2bc861..17ef8dfd2 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -4471,9 +4471,14 @@ MaybeObject* JSObject::DefinePropertyAccessor(String* name, Object* obj = result.GetCallbackObject(); // Need to preserve old getters/setters. if (obj->IsAccessorPair()) { - AccessorPair::cast(obj)->set(is_getter, fun); + AccessorPair* copy; + { MaybeObject* maybe_copy = + AccessorPair::cast(obj)->CopyWithoutTransitions(); + if (!maybe_copy->To(©)) return maybe_copy; + } + copy->set(is_getter, fun); // Use set to update attributes. - { MaybeObject* maybe_ok = SetPropertyCallback(name, obj, attributes); + { MaybeObject* maybe_ok = SetPropertyCallback(name, copy, attributes); if (maybe_ok->IsFailure()) return maybe_ok; } return GetHeap()->undefined_value(); -- 2.34.1