Reviewers: Mads Ager,
Description:
Allow eval to be overridden with a callable non-function object.
We simply need to remove early checks in the resolve eval runtime
functions. CallFunctionStub that follows will handle non-functions in
the right way.
Please review this at http://codereview.chromium.org/6591075/
Affected files:
M src/runtime.cc
A test/mjsunit/override-eval-with-non-function.js
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
fdbd5afb1bf08da92f7de15b65c046e0a8bb1f4e..c009f3768ea6b76107a62b606fb3421cea9e36a1
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -7872,12 +7872,9 @@ static ObjectPair CompileGlobalEval(Handle<String>
source,
static ObjectPair Runtime_ResolvePossiblyDirectEval(Arguments args) {
ASSERT(args.length() == 4);
- if (!args[0]->IsJSFunction()) {
- return MakePair(Top::ThrowIllegalOperation(), NULL);
- }
HandleScope scope;
- Handle<JSFunction> callee = args.at<JSFunction>(0);
+ Handle<Object> callee = args.at<Object>(0);
Handle<Object> receiver; // Will be overwritten.
// Compute the calling context.
@@ -7945,12 +7942,9 @@ static ObjectPair
Runtime_ResolvePossiblyDirectEval(Arguments args) {
static ObjectPair Runtime_ResolvePossiblyDirectEvalNoLookup(Arguments
args) {
ASSERT(args.length() == 4);
- if (!args[0]->IsJSFunction()) {
- return MakePair(Top::ThrowIllegalOperation(), NULL);
- }
HandleScope scope;
- Handle<JSFunction> callee = args.at<JSFunction>(0);
+ Handle<Object> callee = args.at<Object>(0);
// 'eval' is bound in the global context, but it may have been
overwritten.
// Compare it to the builtin 'GlobalEval' function to make sure.
Index: test/mjsunit/override-eval-with-non-function.js
diff --git a/test/mjsunit/override-eval-with-non-function.js
b/test/mjsunit/override-eval-with-non-function.js
new file mode 100644
index
0000000000000000000000000000000000000000..aa93b253050e1ece360168add1899f4237ef1486
--- /dev/null
+++ b/test/mjsunit/override-eval-with-non-function.js
@@ -0,0 +1,36 @@
+// Copyright 2011 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.
+
+// When 'eval' is overridden with a non-function object we should
+// check whether the object is callable.
+
+function test() {
+ eval = /foo/;
+ assertEquals("foo", eval("foobar"));
+}
+
+test();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
