Reviewers: Rico,
Description:
Remove execScript from V8. No longer present i neither Firefox nor Safari.
[email protected]
BUG=
TEST=
Please review this at http://codereview.chromium.org/7046002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/v8natives.js
M test/cctest/test-api.cc
D test/mjsunit/execScript-case-insensitive.js
M test/mjsunit/function-names.js
D test/mjsunit/regress/regress-1341167.js
Index: test/mjsunit/execScript-case-insensitive.js
diff --git a/test/mjsunit/execScript-case-insensitive.js
b/test/mjsunit/execScript-case-insensitive.js
deleted file mode 100644
index
468d65747eafcfe0eb6c9d095df34f907060fb31..0000000000000000000000000000000000000000
--- a/test/mjsunit/execScript-case-insensitive.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2008 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.
-
-var x = 0;
-execScript('x = 1', 'javascript');
-assertEquals(1, x);
-
-execScript('x = 2', 'JavaScript');
-assertEquals(2, x);
-
Index: test/mjsunit/regress/regress-1341167.js
diff --git a/test/mjsunit/regress/regress-1341167.js
b/test/mjsunit/regress/regress-1341167.js
deleted file mode 100644
index
194a7b886a1a54d73ae1819a00002e18d0258f6a..0000000000000000000000000000000000000000
--- a/test/mjsunit/regress/regress-1341167.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2008 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 'this' is bound to the global object when using
-// execScript.
-
-var result;
-execScript("result = this");
-assertTrue(result === this);
Index: src/v8natives.js
diff --git a/src/v8natives.js b/src/v8natives.js
index
8db736c732df02d29c3142d09033078165c54228..d22e94d85ee5416bfdab7d48ae5e23b469084858
100644
--- a/src/v8natives.js
+++ b/src/v8natives.js
@@ -148,17 +148,6 @@ function GlobalEval(x) {
}
-// execScript for IE compatibility.
-function GlobalExecScript(expr, lang) {
- // NOTE: We don't care about the character casing.
- if (!lang || /javascript/i.test(lang)) {
- var f = %CompileString(ToString(expr));
- %_CallFunction(%GlobalReceiver(global), f);
- }
- return null;
-}
-
-
//
----------------------------------------------------------------------------
@@ -178,8 +167,7 @@ function SetupGlobal() {
"isFinite", GlobalIsFinite,
"parseInt", GlobalParseInt,
"parseFloat", GlobalParseFloat,
- "eval", GlobalEval,
- "execScript", GlobalExecScript
+ "eval", GlobalEval
));
}
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
e9d77eca86c63f2ac99a53cb2adf5aa3328836b9..1121210760cdb39b89e72224d6cb02f8fe59ebde
100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -14431,8 +14431,6 @@ void CheckCodeGenerationAllowed() {
CHECK_EQ(42, result->Int32Value());
result = CompileRun("(function(e) { return e('42'); })(eval)");
CHECK_EQ(42, result->Int32Value());
- result = CompileRun("execScript('42')");
- CHECK(!result.IsEmpty());
result = CompileRun("var f = new Function('return 42'); f()");
CHECK_EQ(42, result->Int32Value());
}
@@ -14451,11 +14449,6 @@ void CheckCodeGenerationDisallowed() {
CHECK(try_catch.HasCaught());
try_catch.Reset();
- result = CompileRun("execScript('42')");
- CHECK(result.IsEmpty());
- CHECK(try_catch.HasCaught());
- try_catch.Reset();
-
result = CompileRun("var f = new Function('return 42'); f()");
CHECK(result.IsEmpty());
CHECK(try_catch.HasCaught());
@@ -14478,10 +14471,10 @@ THREADED_TEST(AllowCodeGenFromStrings) {
v8::HandleScope scope;
LocalContext context;
- // eval, execScript and the Function constructor allowed by default.
+ // eval and the Function constructor allowed by default.
CheckCodeGenerationAllowed();
- // Disallow eval, execScript and the Function constructor.
+ // Disallow eval and the Function constructor.
context->AllowCodeGenerationFromStrings(false);
CheckCodeGenerationDisallowed();
Index: test/mjsunit/function-names.js
diff --git a/test/mjsunit/function-names.js b/test/mjsunit/function-names.js
index
c083f18f5d40cb9b4782b62ffac04be94e70aaa6..5ed0b794e8f988216a817345a2c247733c513e7d
100644
--- a/test/mjsunit/function-names.js
+++ b/test/mjsunit/function-names.js
@@ -128,6 +128,6 @@ var globalFunctions = [
"encodeURI", "encodeURIComponent", "Error", "TypeError",
"RangeError", "SyntaxError", "ReferenceError", "EvalError",
"URIError", "isNaN", "isFinite", "parseInt", "parseFloat",
- "eval", "execScript"];
+ "eval"];
TestFunctionNames(this, globalFunctions);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
