Reviewers: Kevin Millikin, Description: Fix issue 221:
http://code.google.com/p/v8/issues/detail?id=221 The attempt to resolve 'eval' went into an infinite loop. Also, we need to throw a reference error in case 'eval' cannot be resolved. Please review this at http://codereview.chromium.org/19536 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/runtime.cc A test/mjsunit/regress/regress-221.js Index: test/mjsunit/regress/regress-221.js =================================================================== --- test/mjsunit/regress/regress-221.js (revision 0) +++ test/mjsunit/regress/regress-221.js (revision 0) @@ -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 that direct eval calls handle the case where eval has been +// deleted correctly. + +// See http://code.google.com/p/v8/issues/detail?id=221 + +assertThrows('eval(delete eval)'); + Index: src/runtime.cc =================================================================== --- src/runtime.cc (revision 1201) +++ src/runtime.cc (working copy) @@ -4061,7 +4061,9 @@ while (!context.is_null()) { receiver = context->Lookup(Factory::eval_symbol(), FOLLOW_PROTOTYPE_CHAIN, &index, &attributes); - if (attributes != ABSENT) break; + // Stop search when eval is found or when the global context is + // reached. + if (attributes != ABSENT || context->IsGlobalContext()) break; if (context->is_function_context()) { context = Handle<Context>(Context::cast(context->closure()->context())); } else { @@ -4069,6 +4071,15 @@ } } + // If eval could not be resolved, it has been deleted and we need to + // throw a reference error. + if (attributes == ABSENT) { + Handle<Object> name = Factory::eval_symbol(); + Handle<Object> reference_error = + Factory::NewReferenceError("not_defined", HandleVector(&name, 1)); + return Top::Throw(*reference_error); + } + if (context->IsGlobalContext()) { // 'eval' is bound in the global context, but it may have been overwritten. // Compare it to the builtin 'GlobalEval' function to make sure. --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list v8-dev@googlegroups.com http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---