From 384b0a5408f25079c40cce1b75c6007b77a09854 Mon Sep 17 00:00:00 2001 From: "ager@chromium.org" Date: Thu, 15 Jan 2009 11:31:08 +0000 Subject: [PATCH] Fix issue 191: http://code.google.com/p/v8/issues/detail?id=191 Accessor setters should not be called for eval-introduced context extension objects. This change fixes the issue, but I think it is time to separate out the lookup routines for eval-introduced context extension objects. There is no reason to use the general lookup routines for this. I'll do that in a separate changelist. Review URL: http://codereview.chromium.org/18090 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1076 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects.cc | 2 +- test/mjsunit/regress/regress-191.js | 42 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-191.js diff --git a/src/objects.cc b/src/objects.cc index 0dc9887991..137fed0d5f 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -1599,7 +1599,7 @@ Object* JSObject::SetProperty(LookupResult* result, return JSObject::cast(proto)->SetProperty(result, name, value, attributes); } - if (result->IsNotFound() || !result->IsProperty()) { + if (!result->IsProperty() && !IsJSContextExtensionObject()) { // We could not find a local property so let's check whether there is an // accessor that wants to handle the property. LookupResult accessor_result; diff --git a/test/mjsunit/regress/regress-191.js b/test/mjsunit/regress/regress-191.js new file mode 100644 index 0000000000..ca513c991d --- /dev/null +++ b/test/mjsunit/regress/regress-191.js @@ -0,0 +1,42 @@ +// Copyright 2009 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. + +// Make sure that accessor setters are ignored on context extension +// objects. +// See http://code.google.com/p/v8/issues/detail?id=191 + +var setterCalled = false; + +Object.prototype.__defineSetter__("x", function() { setterCalled = true; }); + +function test() { + eval("var x = 42"); + assertFalse(setterCalled, "accessor setter call on context object"); + assertEquals(42, eval("x")); +} + +test();