From 85800eff3fb11678f56db95fe0ba85dc48f77314 Mon Sep 17 00:00:00 2001 From: "rossberg@chromium.org" Date: Tue, 11 Mar 2014 16:46:35 +0000 Subject: [PATCH] Fix issue with getOwnPropertySymbols and hidden properties When getting the symbols of an object we need to ignore the hidden properties of the prototype object since the hidden properties are represented by a single string key and we will not include that hidden string in the found names. BUG=350864 LOG=Y R=rossberg@chromium.org Review URL: https://codereview.chromium.org/192883005 Patch from Erik Arvidsson . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19813 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/runtime.cc | 4 +++- test/mjsunit/regress/regress-crbug-350864.js | 36 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-crbug-350864.js diff --git a/src/runtime.cc b/src/runtime.cc index 0dd538a..2d390a1 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -5794,7 +5794,9 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetLocalPropertyNames) { } } next_copy_index += local_property_count[i]; - if (jsproto->HasHiddenProperties()) { + + // Hidden properties only show up if the filter does not skip strings. + if ((filter & STRING) == 0 && jsproto->HasHiddenProperties()) { hidden_strings++; } if (i < length - 1) { diff --git a/test/mjsunit/regress/regress-crbug-350864.js b/test/mjsunit/regress/regress-crbug-350864.js new file mode 100644 index 0000000..eef3dba --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-350864.js @@ -0,0 +1,36 @@ +// Copyright 2014 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. + +// Flags: --harmony_symbols --harmony-collections + +var v0 = new WeakMap; +var v1 = {}; +v0.set(v1, 1); +var sym = Symbol(); +v1[sym] = 1; +var symbols = Object.getOwnPropertySymbols(v1); +assertArrayEquals([sym], symbols); -- 2.7.4