From 0a856e0bd7dc35672aab85b40b28270e29246eff Mon Sep 17 00:00:00 2001 From: "erik.corry@gmail.com" Date: Mon, 4 Jun 2012 12:07:46 +0000 Subject: [PATCH] Fix bug in __proto__ assignment transition cache where we forget the next enumeration index resulting in wrong iteration order. Review URL: https://chromiumcodereview.appspot.com/10515006 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11706 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects.cc | 1 + test/mjsunit/regress/regress-iteration-order.js | 42 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 test/mjsunit/regress/regress-iteration-order.js diff --git a/src/objects.cc b/src/objects.cc index c015fe1..1544836 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -6040,6 +6040,7 @@ MaybeObject* DescriptorArray::RemoveTransitions() { } } ASSERT(next_descriptor == new_descriptors->number_of_descriptors()); + new_descriptors->SetNextEnumerationIndex(NextEnumerationIndex()); return new_descriptors; } diff --git a/test/mjsunit/regress/regress-iteration-order.js b/test/mjsunit/regress/regress-iteration-order.js new file mode 100644 index 0000000..76f5c3f --- /dev/null +++ b/test/mjsunit/regress/regress-iteration-order.js @@ -0,0 +1,42 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +var x = {a: 1, b: 2, c: 3}; + +x.__proto__ = {}; + +delete x.b; + +x.d = 4; + +s = ""; + +for (key in x) { + s += x[key]; +} + +assertEquals("134", s); -- 2.7.4