Revision: 3421 Author: [email protected] Date: Fri Dec 4 03:59:09 2009 Log: Fix issue 540 by handling the case that a declaration is in the arguments object.
See http://code.google.com/p/v8/issues/detail?id=540 Review URL: http://codereview.chromium.org/460070 http://code.google.com/p/v8/source/detail?r=3421 Added: /branches/bleeding_edge/test/mjsunit/regress/regress-540.js Modified: /branches/bleeding_edge/src/runtime.cc ======================================= --- /dev/null +++ /branches/bleeding_edge/test/mjsunit/regress/regress-540.js Fri Dec 4 03:59:09 2009 @@ -0,0 +1,34 @@ +// 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. + +// Test context slot declarations in the arguments object. +// See http://code.google.com/p/v8/issues/detail?id=540 + +function f(x, y) { eval(x); return y(); } +assertEquals(1, f("function y() { return 1; }", + function () { return 0; })); + ======================================= --- /branches/bleeding_edge/src/runtime.cc Thu Dec 3 00:44:33 2009 +++ /branches/bleeding_edge/src/runtime.cc Fri Dec 4 03:59:09 2009 @@ -719,12 +719,15 @@ if (*initial_value != NULL) { if (index >= 0) { // The variable or constant context slot should always be in - // the function context; not in any outer context nor in the - // arguments object. - ASSERT(holder.is_identical_to(context)); - if (((attributes & READ_ONLY) == 0) || - context->get(index)->IsTheHole()) { - context->set(index, *initial_value); + // the function context or the arguments object. + if (holder->IsContext()) { + ASSERT(holder.is_identical_to(context)); + if (((attributes & READ_ONLY) == 0) || + context->get(index)->IsTheHole()) { + context->set(index, *initial_value); + } + } else { + Handle<JSObject>::cast(holder)->SetElement(index, *initial_value); } } else { // Slow case: The property is not in the FixedArray part of the context. -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
