From 73f7dab4ed344f986e558b9809e831c9a757f9c4 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Mon, 28 Jan 2013 14:25:14 -0800 Subject: [PATCH] Bug 833208 (part 1) - Remove e4x support from jit-tests. r=jwalden. --HG-- rename : dom/browser-element/BrowserElementParent.jsm => dom/browser-element/BrowserElementParent.js rename : js/src/jit-test/tests/e4x/bug613151.js => js/src/jit-test/tests/basic/bug613151.js rename : js/src/jit-test/tests/e4x/bug651966.js => js/src/jit-test/tests/basic/bug651966.js rename : js/src/jit-test/tests/e4x/bug737251.js => js/src/jit-test/tests/basic/bug737251.js extra : rebase_source : 2102a879231490bf1b73249b4889c2d83c73010f --- js/src/jit-test/lib/prolog.js | 3 --- .../jit-test/tests/auto-regress/bug566815.js | 8 ------- .../jit-test/tests/auto-regress/bug580967.js | 12 ---------- .../jit-test/tests/auto-regress/bug638735.js | 2 +- .../jit-test/tests/auto-regress/bug679810.js | 2 +- .../jit-test/tests/auto-regress/bug688973.js | 8 ------- .../jit-test/tests/auto-regress/bug712169.js | 2 +- .../jit-test/tests/auto-regress/bug748119.js | 1 - js/src/jit-test/tests/basic/bug583615.js | 12 ---------- .../tests/{e4x => basic}/bug613151.js | 4 ++-- js/src/jit-test/tests/basic/bug641491.js | 2 +- js/src/jit-test/tests/basic/bug642772-2.js | 3 --- js/src/jit-test/tests/basic/bug643244.js | 2 +- js/src/jit-test/tests/basic/bug646968-6.js | 2 +- js/src/jit-test/tests/basic/bug647695.js | 2 +- .../tests/{e4x => basic}/bug651966.js | 4 ++-- js/src/jit-test/tests/basic/bug690292.js | 2 +- js/src/jit-test/tests/basic/bug700501.js | 1 - js/src/jit-test/tests/basic/bug703818.js | 2 +- .../tests/{e4x => basic}/bug737251.js | 2 +- js/src/jit-test/tests/basic/bug738846.js | 2 +- js/src/jit-test/tests/basic/bug791465.js | 8 +------ js/src/jit-test/tests/basic/testBug616119.js | 6 ----- .../basic/testCaseTypeMismatchBadness.js | 2 +- js/src/jit-test/tests/basic/testDeepBail1.js | 2 +- .../tests/basic/testInterpreterReentery8.js | 6 ----- .../tests/debug/Environment-identity-03.js | 3 --- js/src/jit-test/tests/e4x/bug557168-1.js | 11 --------- js/src/jit-test/tests/e4x/bug557168-2.js | 11 --------- js/src/jit-test/tests/e4x/bug557168-3.js | 10 -------- js/src/jit-test/tests/e4x/bug557168.js | 4 ---- js/src/jit-test/tests/e4x/bug569843.js | 4 ---- js/src/jit-test/tests/e4x/bug574280.js | 4 ---- .../jit-test/tests/e4x/bug596502-version.js | 23 ------------------ js/src/jit-test/tests/e4x/bug605200.js | 10 -------- js/src/jit-test/tests/e4x/bug632206.js | 6 ----- js/src/jit-test/tests/e4x/bug665812.js | 7 ------ js/src/jit-test/tests/e4x/bug672153.js | 1 - js/src/jit-test/tests/e4x/bug700799.js | 1 - js/src/jit-test/tests/e4x/bug716713.js | 1 - js/src/jit-test/tests/e4x/bug731724.js | 5 ---- js/src/jit-test/tests/e4x/bug731745.js | 5 ---- js/src/jit-test/tests/e4x/bug753885-1.js | 16 ------------- js/src/jit-test/tests/e4x/bug753885-2.js | 24 ------------------- js/src/jit-test/tests/e4x/defaults-e4x.js | 14 ----------- .../e4x/e4x-descendants-with-arguments.js | 6 ----- .../tests/e4x/testXMLPropertyNames.js | 11 --------- js/src/jit-test/tests/ion/bug743099.js | 2 +- js/src/jit-test/tests/ion/bug758384.js | 7 ------ js/src/jit-test/tests/ion/bug765480.js | 2 +- js/src/jit-test/tests/ion/bug787921.js | 2 +- js/src/jit-test/tests/ion/throw.js | 2 +- js/src/jit-test/tests/jaeger/bug549398.js | 2 +- js/src/jit-test/tests/jaeger/bug553784.js | 2 +- js/src/jit-test/tests/jaeger/bug576398.js | 2 +- js/src/jit-test/tests/jaeger/bug582880.js | 3 +-- js/src/jit-test/tests/jaeger/bug588338.js | 4 ++-- js/src/jit-test/tests/jaeger/bug589108.js | 2 +- js/src/jit-test/tests/jaeger/bug591602.js | 2 +- js/src/jit-test/tests/jaeger/bug595921.js | 2 +- js/src/jit-test/tests/jaeger/bug601982.js | 8 +++---- js/src/jit-test/tests/jaeger/bug656096.js | 2 +- js/src/jit-test/tests/jaeger/bug732423.js | 4 ++-- .../tests/jaeger/inline/scripted-11.js | 1 - .../tests/jaeger/recompile/bug646267.js | 2 +- .../tests/jaeger/recompile/bug676764.js | 4 ++-- .../jit-test/tests/jaeger/recompile/exotic.js | 2 +- 67 files changed, 42 insertions(+), 294 deletions(-) delete mode 100644 js/src/jit-test/tests/auto-regress/bug566815.js delete mode 100644 js/src/jit-test/tests/auto-regress/bug580967.js delete mode 100644 js/src/jit-test/tests/auto-regress/bug688973.js delete mode 100644 js/src/jit-test/tests/basic/bug583615.js rename js/src/jit-test/tests/{e4x => basic}/bug613151.js (78%) rename js/src/jit-test/tests/{e4x => basic}/bug651966.js (81%) rename js/src/jit-test/tests/{e4x => basic}/bug737251.js (78%) delete mode 100644 js/src/jit-test/tests/basic/testBug616119.js delete mode 100644 js/src/jit-test/tests/basic/testInterpreterReentery8.js delete mode 100644 js/src/jit-test/tests/e4x/bug557168-1.js delete mode 100644 js/src/jit-test/tests/e4x/bug557168-2.js delete mode 100644 js/src/jit-test/tests/e4x/bug557168-3.js delete mode 100644 js/src/jit-test/tests/e4x/bug557168.js delete mode 100644 js/src/jit-test/tests/e4x/bug569843.js delete mode 100644 js/src/jit-test/tests/e4x/bug574280.js delete mode 100644 js/src/jit-test/tests/e4x/bug596502-version.js delete mode 100644 js/src/jit-test/tests/e4x/bug605200.js delete mode 100644 js/src/jit-test/tests/e4x/bug632206.js delete mode 100644 js/src/jit-test/tests/e4x/bug665812.js delete mode 100644 js/src/jit-test/tests/e4x/bug672153.js delete mode 100644 js/src/jit-test/tests/e4x/bug700799.js delete mode 100644 js/src/jit-test/tests/e4x/bug716713.js delete mode 100644 js/src/jit-test/tests/e4x/bug731724.js delete mode 100644 js/src/jit-test/tests/e4x/bug731745.js delete mode 100644 js/src/jit-test/tests/e4x/bug753885-1.js delete mode 100644 js/src/jit-test/tests/e4x/bug753885-2.js delete mode 100644 js/src/jit-test/tests/e4x/defaults-e4x.js delete mode 100644 js/src/jit-test/tests/e4x/e4x-descendants-with-arguments.js delete mode 100644 js/src/jit-test/tests/e4x/testXMLPropertyNames.js delete mode 100644 js/src/jit-test/tests/ion/bug758384.js diff --git a/js/src/jit-test/lib/prolog.js b/js/src/jit-test/lib/prolog.js index eccb7291c21..9ccf8187f04 100644 --- a/js/src/jit-test/lib/prolog.js +++ b/js/src/jit-test/lib/prolog.js @@ -35,6 +35,3 @@ if (!("verifypostbarriers" in this)) { if (!("gcPreserveCode" in this)) { gcPreserveCode = function() { } } - -if ("options" in this) - options("allow_xml"); diff --git a/js/src/jit-test/tests/auto-regress/bug566815.js b/js/src/jit-test/tests/auto-regress/bug566815.js deleted file mode 100644 index 502cba17660..00000000000 --- a/js/src/jit-test/tests/auto-regress/bug566815.js +++ /dev/null @@ -1,8 +0,0 @@ -// |jit-test| error:TypeError - -// Binary: cache/js-dbg-64-6fc5d661ca55-linux -// Flags: -// -x = /x/ -x.__proto__ = new Namespace -x > 0 diff --git a/js/src/jit-test/tests/auto-regress/bug580967.js b/js/src/jit-test/tests/auto-regress/bug580967.js deleted file mode 100644 index b8926de13be..00000000000 --- a/js/src/jit-test/tests/auto-regress/bug580967.js +++ /dev/null @@ -1,12 +0,0 @@ -// Binary: cache/js-dbg-64-c338f8b7371e-linux -// Flags: -j -// -(function(){ - (eval("\ - (function(){\ - if(XML('aa'.replace(/a/g,function(){for(l in[0,0,0]){\ - print(this)\ - }}))){('')}\ - })\ - "))() -})() diff --git a/js/src/jit-test/tests/auto-regress/bug638735.js b/js/src/jit-test/tests/auto-regress/bug638735.js index 4c8f6132f2d..454745d7d09 100644 --- a/js/src/jit-test/tests/auto-regress/bug638735.js +++ b/js/src/jit-test/tests/auto-regress/bug638735.js @@ -9,7 +9,7 @@ ox1 = wrap(o); } f5(o9); f5(o13); -var o0 = XMLList; +var o0 = []; function f3(o) { var prop = Object.getOwnPropertyNames(ox1)[0]; if (prop) { Object.defineProperty(ox1, prop, {configurable: true,enumerable: true,unused: 1 }); } diff --git a/js/src/jit-test/tests/auto-regress/bug679810.js b/js/src/jit-test/tests/auto-regress/bug679810.js index a33c81b536a..56eafcf294c 100644 --- a/js/src/jit-test/tests/auto-regress/bug679810.js +++ b/js/src/jit-test/tests/auto-regress/bug679810.js @@ -10,5 +10,5 @@ function Engineer(name, projs, machine) { this.base(name, "engineering", projs) this.machine = machine || ""; } -Engineer.prototype = new XMLList(); +Engineer.prototype = {}; var les = new Engineer("Morris, Les", new Array("JavaScript"), "indy"); diff --git a/js/src/jit-test/tests/auto-regress/bug688973.js b/js/src/jit-test/tests/auto-regress/bug688973.js deleted file mode 100644 index 80ce8e7ca70..00000000000 --- a/js/src/jit-test/tests/auto-regress/bug688973.js +++ /dev/null @@ -1,8 +0,0 @@ -// |jit-test| error:TypeError - -// Binary: cache/js-dbg-64-fecae145d884-linux -// Flags: -// - -const [ QName, [] ] = ['a b','c d']; -var xmlOl = new XML('foo'); diff --git a/js/src/jit-test/tests/auto-regress/bug712169.js b/js/src/jit-test/tests/auto-regress/bug712169.js index cdbbf3564ea..21693fe4e8d 100644 --- a/js/src/jit-test/tests/auto-regress/bug712169.js +++ b/js/src/jit-test/tests/auto-regress/bug712169.js @@ -9,6 +9,6 @@ try { for (var icount = 0; icount < 25; ++icount, let(icount2, printStatus) (function() gczeal(2))[1]++) str = str + str; } catch(ex) { - new XML( str, false, (new RegExp('[0-9]{3}')).test('23 2 34 78 9 09')); + new Date( str, false, (new RegExp('[0-9]{3}')).test('23 2 34 78 9 09')); } this.toSource(); diff --git a/js/src/jit-test/tests/auto-regress/bug748119.js b/js/src/jit-test/tests/auto-regress/bug748119.js index d992955e439..759db8cb105 100644 --- a/js/src/jit-test/tests/auto-regress/bug748119.js +++ b/js/src/jit-test/tests/auto-regress/bug748119.js @@ -77,7 +77,6 @@ function toPrinted(value) value=value.replace(/\\\\n/g, 'NL').replace(/[^\\x20-\ "); lfcode.push("\ var summary = 'Regression test for bug 385393';\ -var current = isXMLName({});\ var expect = 'No Crash';\ reportCompare(expect, actual, summary);\ "); diff --git a/js/src/jit-test/tests/basic/bug583615.js b/js/src/jit-test/tests/basic/bug583615.js deleted file mode 100644 index 10ba6033707..00000000000 --- a/js/src/jit-test/tests/basic/bug583615.js +++ /dev/null @@ -1,12 +0,0 @@ -// |jit-test| slow; - -try { - x = - x += /x / -} catch (e) {} -for each(a in [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0, 0]) { - x += x; -} -default xml namespace = x; - diff --git a/js/src/jit-test/tests/e4x/bug613151.js b/js/src/jit-test/tests/basic/bug613151.js similarity index 78% rename from js/src/jit-test/tests/e4x/bug613151.js rename to js/src/jit-test/tests/basic/bug613151.js index cc2f1fa9de1..6a3a24ae3ac 100644 --- a/js/src/jit-test/tests/e4x/bug613151.js +++ b/js/src/jit-test/tests/basic/bug613151.js @@ -1,4 +1,4 @@ -// Iterating over a property with an XML id. +// Iterating over a property with an Array id. function n() {} function g() {} eval("\ @@ -7,7 +7,7 @@ eval("\ for (w in this) {}\ Object.defineProperty(\ this, \ - new QName, \ + new Array, \ ({enumerable: true})\ )\ }\ diff --git a/js/src/jit-test/tests/basic/bug641491.js b/js/src/jit-test/tests/basic/bug641491.js index de6cb510aaa..653e47a6abd 100644 --- a/js/src/jit-test/tests/basic/bug641491.js +++ b/js/src/jit-test/tests/basic/bug641491.js @@ -3,7 +3,7 @@ function f1() { function f2() { } function f3(o) { - f2 = XML.prototype; + f2 = Date.prototype; } var key = Object.getOwnPropertyNames(f1)[30]; if(key) { diff --git a/js/src/jit-test/tests/basic/bug642772-2.js b/js/src/jit-test/tests/basic/bug642772-2.js index cd7c4004b1f..d797664bfb8 100644 --- a/js/src/jit-test/tests/basic/bug642772-2.js +++ b/js/src/jit-test/tests/basic/bug642772-2.js @@ -20,7 +20,6 @@ delete Math; delete Number; delete String; delete Regexp; -delete XML; delete Reflect; delete Proxy; delete Error; @@ -50,7 +49,6 @@ failWrapper(function () { Math; }); failWrapper(function () { Number; }); failWrapper(function () { String; }); failWrapper(function () { Regexp; }); -failWrapper(function () { XML; }); failWrapper(function () { Reflect; }); failWrapper(function () { Proxy; }); failWrapper(function () { Error; }); @@ -83,7 +81,6 @@ failWrapper(function () { Math; }); failWrapper(function () { Number; }); failWrapper(function () { String; }); failWrapper(function () { Regexp; }); -failWrapper(function () { XML; }); failWrapper(function () { Reflect; }); failWrapper(function () { Proxy; }); failWrapper(function () { Error; }); diff --git a/js/src/jit-test/tests/basic/bug643244.js b/js/src/jit-test/tests/basic/bug643244.js index c42769bf876..90e2d510ebd 100644 --- a/js/src/jit-test/tests/basic/bug643244.js +++ b/js/src/jit-test/tests/basic/bug643244.js @@ -1,2 +1,2 @@ delete(0).__proto__.valueOf -eval("(function(){(0).valueOf();})")() +eval("(function(){(0).valueOf();})")() diff --git a/js/src/jit-test/tests/basic/bug646968-6.js b/js/src/jit-test/tests/basic/bug646968-6.js index c24eb4bbcef..75f917926a5 100644 --- a/js/src/jit-test/tests/basic/bug646968-6.js +++ b/js/src/jit-test/tests/basic/bug646968-6.js @@ -1,6 +1,6 @@ function test(s) { eval(s); - let (a =

.q = 0, x = x) + let (a = ({}).q = 0, x = x) assertEq(x, 5); } test('var x = 5;'); diff --git a/js/src/jit-test/tests/basic/bug647695.js b/js/src/jit-test/tests/basic/bug647695.js index e5ebd5dbf41..0f23b82c950 100644 --- a/js/src/jit-test/tests/basic/bug647695.js +++ b/js/src/jit-test/tests/basic/bug647695.js @@ -1,4 +1,4 @@ -try { let(x = XMLList(7), y = let(a = x)("")) {} } catch (e) {} +try { let(x = Date(7), y = let(a = x)("")) {} } catch (e) {} try { with({ diff --git a/js/src/jit-test/tests/e4x/bug651966.js b/js/src/jit-test/tests/basic/bug651966.js similarity index 81% rename from js/src/jit-test/tests/e4x/bug651966.js rename to js/src/jit-test/tests/basic/bug651966.js index 5e91fe38b74..d2f9a522d48 100644 --- a/js/src/jit-test/tests/e4x/bug651966.js +++ b/js/src/jit-test/tests/basic/bug651966.js @@ -19,14 +19,14 @@ f(); f(); f(); f(); -try { f(".(x=[]);function x(){}(x())"); } catch (e) {} +try { f("function x(){}(x())"); } catch (e) {} function f2() { a = { x } = x, (x._) function - x()( * :: * ) + x()({}) } try { f2(); } catch (e) {} diff --git a/js/src/jit-test/tests/basic/bug690292.js b/js/src/jit-test/tests/basic/bug690292.js index 06647272799..43ab56dd77c 100644 --- a/js/src/jit-test/tests/basic/bug690292.js +++ b/js/src/jit-test/tests/basic/bug690292.js @@ -3,7 +3,7 @@ done = false; try { function x() {} print(this.watch("d", Object.create)) - var d = + var d = {} } catch (e) {} try { eval("d = ''") diff --git a/js/src/jit-test/tests/basic/bug700501.js b/js/src/jit-test/tests/basic/bug700501.js index 65a130987e1..1f4426cb6e8 100644 --- a/js/src/jit-test/tests/basic/bug700501.js +++ b/js/src/jit-test/tests/basic/bug700501.js @@ -1,7 +1,6 @@ Function.prototype.__proto__["p"] = 3 c = [].__proto__ c[5] = 3 -Namespace.prototype.__proto__[4] = function() {} gc() Function("\ {\ diff --git a/js/src/jit-test/tests/basic/bug703818.js b/js/src/jit-test/tests/basic/bug703818.js index be8fdaf5a1f..9d844986afe 100644 --- a/js/src/jit-test/tests/basic/bug703818.js +++ b/js/src/jit-test/tests/basic/bug703818.js @@ -1,3 +1,3 @@ -Object.defineProperty(Namespace.prototype, "toString", { +Object.defineProperty(Array.prototype, "toString", { enumerable: true }) diff --git a/js/src/jit-test/tests/e4x/bug737251.js b/js/src/jit-test/tests/basic/bug737251.js similarity index 78% rename from js/src/jit-test/tests/e4x/bug737251.js rename to js/src/jit-test/tests/basic/bug737251.js index a5bae697d20..14d5ae143d4 100644 --- a/js/src/jit-test/tests/e4x/bug737251.js +++ b/js/src/jit-test/tests/basic/bug737251.js @@ -1,5 +1,5 @@ a = {} -a.getOwnPropertyDescriptor = XML; +a.getOwnPropertyDescriptor = Array; b = Proxy.create(a) for (x in this) try { diff --git a/js/src/jit-test/tests/basic/bug738846.js b/js/src/jit-test/tests/basic/bug738846.js index d99c5686035..b86fce2f1b9 100644 --- a/js/src/jit-test/tests/basic/bug738846.js +++ b/js/src/jit-test/tests/basic/bug738846.js @@ -13,7 +13,7 @@ try { } catch (e) {} try { (function() { - n.(O) + true }()) } catch (e) {} try { diff --git a/js/src/jit-test/tests/basic/bug791465.js b/js/src/jit-test/tests/basic/bug791465.js index ff27a5658b2..b2165d0cce2 100644 --- a/js/src/jit-test/tests/basic/bug791465.js +++ b/js/src/jit-test/tests/basic/bug791465.js @@ -1,11 +1,5 @@ load(libdir + "asserts.js"); -function xmlAllowed() { - return (typeof options == "function") && - (options() + "").contains("allow_xml"); -} - - var valid_strict_funs = [ // directive ends on next line function () { @@ -56,7 +50,7 @@ var invalid_strict_funs = [ "use strict" (); }, - ...(xmlAllowed() ? [Function("'use strict'\n..not")] : []), + ...([]), ...[Function("'use strict'\n " + op + " 'not'") for (op of binary_ops)], ]; diff --git a/js/src/jit-test/tests/basic/testBug616119.js b/js/src/jit-test/tests/basic/testBug616119.js deleted file mode 100644 index c41ab54cff4..00000000000 --- a/js/src/jit-test/tests/basic/testBug616119.js +++ /dev/null @@ -1,6 +0,0 @@ -// don't assert -for (a = 0; a < 9; ++a) { - M: for (let c in >) { - break M - } -} diff --git a/js/src/jit-test/tests/basic/testCaseTypeMismatchBadness.js b/js/src/jit-test/tests/basic/testCaseTypeMismatchBadness.js index d6132ef97ec..4bacba9aaea 100644 --- a/js/src/jit-test/tests/basic/testCaseTypeMismatchBadness.js +++ b/js/src/jit-test/tests/basic/testCaseTypeMismatchBadness.js @@ -9,7 +9,7 @@ function testCaseTypeMismatchBadness() break; case "": - case : + case {}: break; } } diff --git a/js/src/jit-test/tests/basic/testDeepBail1.js b/js/src/jit-test/tests/basic/testDeepBail1.js index 99b1ce80c69..779f96597e7 100644 --- a/js/src/jit-test/tests/basic/testDeepBail1.js +++ b/js/src/jit-test/tests/basic/testDeepBail1.js @@ -1,5 +1,5 @@ function testDeepBail1() { - var y = ; + var y = [1,2,3]; for (var i = 0; i < 9; i++) "" in y; } diff --git a/js/src/jit-test/tests/basic/testInterpreterReentery8.js b/js/src/jit-test/tests/basic/testInterpreterReentery8.js deleted file mode 100644 index 3996af4227e..00000000000 --- a/js/src/jit-test/tests/basic/testInterpreterReentery8.js +++ /dev/null @@ -1,6 +0,0 @@ -// Bug 462027 comment 54. -function testInterpreterReentery8() { - var e = ; - for (var j = 0; j < 4; ++j) { +[e]; } -} -testInterpreterReentery8(); diff --git a/js/src/jit-test/tests/debug/Environment-identity-03.js b/js/src/jit-test/tests/debug/Environment-identity-03.js index 9a020182006..a5d61eaf86f 100644 --- a/js/src/jit-test/tests/debug/Environment-identity-03.js +++ b/js/src/jit-test/tests/debug/Environment-identity-03.js @@ -56,9 +56,6 @@ test("a", 2, "q = function (a) { (function (b) { h(); a = b; })(2); h(); }; q(1) test("a", 2, "q = function (a) { h(); return function (b) { h(); a = b; }; }; q(1)(2);"); test("n", 3, "q = function (n) { for (var i = 0; i < n; i++) { let (j = i) { h(); } } }; q(3);"); -// Don't crash in E4X filter scopes. -test("x", 2, "q = function () { var x = <>.(function (e) { h(); }(this)); }; q();"); - // A function with long dynamic and static chains. var N = 80; diff --git a/js/src/jit-test/tests/e4x/bug557168-1.js b/js/src/jit-test/tests/e4x/bug557168-1.js deleted file mode 100644 index cf417397411..00000000000 --- a/js/src/jit-test/tests/e4x/bug557168-1.js +++ /dev/null @@ -1,11 +0,0 @@ -x = -try { - Function("\ - (function f() {\ - ({x:{b}}=x);\ - f.apply(null, new Array(100))\ - })()\ - ")() -} catch (e) { - assertEq(e.message, "too much recursion"); -} diff --git a/js/src/jit-test/tests/e4x/bug557168-2.js b/js/src/jit-test/tests/e4x/bug557168-2.js deleted file mode 100644 index 8b57537b3b9..00000000000 --- a/js/src/jit-test/tests/e4x/bug557168-2.js +++ /dev/null @@ -1,11 +0,0 @@ -x = -try { - Function("\ - (function f() {\ - ({x}=x);\ - f.apply(null, new Array(100))\ - })()\ - ")() -} catch (e) { - assertEq(e.message, "too much recursion"); -} diff --git a/js/src/jit-test/tests/e4x/bug557168-3.js b/js/src/jit-test/tests/e4x/bug557168-3.js deleted file mode 100644 index 31cd262be83..00000000000 --- a/js/src/jit-test/tests/e4x/bug557168-3.js +++ /dev/null @@ -1,10 +0,0 @@ -x = -try { - Function("\ - for(var a = 0; a < 6; a++) {\ - Number(x.u)\ - }\ - ")() -} catch (e) { - assertEq(e.message, "too much recursion"); -} diff --git a/js/src/jit-test/tests/e4x/bug557168.js b/js/src/jit-test/tests/e4x/bug557168.js deleted file mode 100644 index 737052fbcb9..00000000000 --- a/js/src/jit-test/tests/e4x/bug557168.js +++ /dev/null @@ -1,4 +0,0 @@ -x = -for (var z = 0; z < 4; z++) { - print(x.z) -} diff --git a/js/src/jit-test/tests/e4x/bug569843.js b/js/src/jit-test/tests/e4x/bug569843.js deleted file mode 100644 index ff70ad6f45a..00000000000 --- a/js/src/jit-test/tests/e4x/bug569843.js +++ /dev/null @@ -1,4 +0,0 @@ -x = ; -for each(l in [0, 0, 0, 0]) { - delete x.d; -} diff --git a/js/src/jit-test/tests/e4x/bug574280.js b/js/src/jit-test/tests/e4x/bug574280.js deleted file mode 100644 index bcd3469552a..00000000000 --- a/js/src/jit-test/tests/e4x/bug574280.js +++ /dev/null @@ -1,4 +0,0 @@ -for (p = 0; p < 4; p++) { - a = 0 - new XMLList -} diff --git a/js/src/jit-test/tests/e4x/bug596502-version.js b/js/src/jit-test/tests/e4x/bug596502-version.js deleted file mode 100644 index 5508328a418..00000000000 --- a/js/src/jit-test/tests/e4x/bug596502-version.js +++ /dev/null @@ -1,23 +0,0 @@ -/* All versions >= 1.6. */ - -function syntaxErrorFromXML() { - try { - var f = new Function('var text = .toString();'); - return false; - } catch (e if e instanceof SyntaxError) { - return true; - } -} - -version(150); -assertEq(syntaxErrorFromXML(), true); -revertVersion(); - -for (vno in {160: null, 170: null, 180: null}) { - print('Setting version to: ' + vno); - version(Number(vno)); - assertEq(syntaxErrorFromXML(), false); - revertVersion(); -} - -print('PASS!') diff --git a/js/src/jit-test/tests/e4x/bug605200.js b/js/src/jit-test/tests/e4x/bug605200.js deleted file mode 100644 index 9e1e6e80da2..00000000000 --- a/js/src/jit-test/tests/e4x/bug605200.js +++ /dev/null @@ -1,10 +0,0 @@ - -function foo() { - var name = 2; - var x = what; - var y = "" + x.(name != 2); - assertEq(y.match(/what/)[0], "what"); - var z = "" + x.(name = 10); - assertEq(z.match(/10/)[0], "10"); -} -foo(); diff --git a/js/src/jit-test/tests/e4x/bug632206.js b/js/src/jit-test/tests/e4x/bug632206.js deleted file mode 100644 index d98c88bc36a..00000000000 --- a/js/src/jit-test/tests/e4x/bug632206.js +++ /dev/null @@ -1,6 +0,0 @@ -// don't crash -x = -for (a = 0; a < 9; a++) { - x.elements() -} - diff --git a/js/src/jit-test/tests/e4x/bug665812.js b/js/src/jit-test/tests/e4x/bug665812.js deleted file mode 100644 index 58c66b7b2d1..00000000000 --- a/js/src/jit-test/tests/e4x/bug665812.js +++ /dev/null @@ -1,7 +0,0 @@ -// |jit-test| error: TypeError - -(function() { - function::d = 0 - d.(l) - function d() {} -})() diff --git a/js/src/jit-test/tests/e4x/bug672153.js b/js/src/jit-test/tests/e4x/bug672153.js deleted file mode 100644 index 8c6b2453b96..00000000000 --- a/js/src/jit-test/tests/e4x/bug672153.js +++ /dev/null @@ -1 +0,0 @@ -uneval(Function("[] = (*::*++);print(x);")); diff --git a/js/src/jit-test/tests/e4x/bug700799.js b/js/src/jit-test/tests/e4x/bug700799.js deleted file mode 100644 index 7a543325fa8..00000000000 --- a/js/src/jit-test/tests/e4x/bug700799.js +++ /dev/null @@ -1 +0,0 @@ -for (let x in [.(let(x) function() {})]) {} diff --git a/js/src/jit-test/tests/e4x/bug716713.js b/js/src/jit-test/tests/e4x/bug716713.js deleted file mode 100644 index 95054b2ccac..00000000000 --- a/js/src/jit-test/tests/e4x/bug716713.js +++ /dev/null @@ -1 +0,0 @@ -uneval(function() { @o() }) diff --git a/js/src/jit-test/tests/e4x/bug731724.js b/js/src/jit-test/tests/e4x/bug731724.js deleted file mode 100644 index 120c6993401..00000000000 --- a/js/src/jit-test/tests/e4x/bug731724.js +++ /dev/null @@ -1,5 +0,0 @@ -function g(s) { - return eval(s) -} -f = g("(function(){({x:function::arguments})})") -f() diff --git a/js/src/jit-test/tests/e4x/bug731745.js b/js/src/jit-test/tests/e4x/bug731745.js deleted file mode 100644 index 47fd470505f..00000000000 --- a/js/src/jit-test/tests/e4x/bug731745.js +++ /dev/null @@ -1,5 +0,0 @@ -function h(s) { - return eval(s) -} -f = h("(function(){function::arguments=[]})") -for (a in f()) {} diff --git a/js/src/jit-test/tests/e4x/bug753885-1.js b/js/src/jit-test/tests/e4x/bug753885-1.js deleted file mode 100644 index 0609a8bbe99..00000000000 --- a/js/src/jit-test/tests/e4x/bug753885-1.js +++ /dev/null @@ -1,16 +0,0 @@ -// XML syntax is not available unless JSOPTION_ALLOW_XML is enabled. - -load(libdir + "asserts.js"); - -var exprs = ["", "x..y", "x.@id", "x.(@id === '13')", "x.*", "x.function::length", - "function::parseInt", "a::b"]; - -assertEq(options().split(",").indexOf("allow_xml") >= 0, true); - -options("allow_xml"); // turn it off -for (var e of exprs) - assertThrowsInstanceOf(function () { Function("return " + e + ";"); }, SyntaxError); - -options("allow_xml"); // turn it back on -for (var e of exprs) - assertEq(typeof Function("return " + e + ";"), "function"); diff --git a/js/src/jit-test/tests/e4x/bug753885-2.js b/js/src/jit-test/tests/e4x/bug753885-2.js deleted file mode 100644 index 1907029875c..00000000000 --- a/js/src/jit-test/tests/e4x/bug753885-2.js +++ /dev/null @@ -1,24 +0,0 @@ -// XML-specific classes do not resolve unless JSOPTION_ALLOW_XML is enabled. - -assertEq(options().split(",").indexOf("allow_xml") >= 0, true); -options("allow_xml"); - -var xmlnames = ["XML", "XMLList", "isXMLName", "QName", "Namespace"]; -for (var name of xmlnames) - assertEq(name in this, false); - -var globals = Object.getOwnPropertyNames(this); -for (var name of xmlnames) - assertEq(globals.indexOf(name), -1); - -var g = newGlobal('new-compartment'); -for (var name of xmlnames) - assertEq(name in g, false); - -// Turn it back on and check that the XML classes magically appear. -options("allow_xml"); -assertEq("QName" in this, true); - -globals = Object.getOwnPropertyNames(this); -for (var name of xmlnames) - assertEq(globals.indexOf(name) >= 0, true); diff --git a/js/src/jit-test/tests/e4x/defaults-e4x.js b/js/src/jit-test/tests/e4x/defaults-e4x.js deleted file mode 100644 index fb53db038dc..00000000000 --- a/js/src/jit-test/tests/e4x/defaults-e4x.js +++ /dev/null @@ -1,14 +0,0 @@ -load(libdir + "asserts.js"); - -assertThrowsInstanceOf(function () { - eval("function f(a=) {}"); -}, SyntaxError); -assertThrowsInstanceOf(function () { - eval("function f(a=) { 'use strict'; }"); -}, SyntaxError); -assertThrowsInstanceOf(function () { - eval("function f(a=(function () { })) {}"); -}, SyntaxError); -assertThrowsInstanceOf(function () { - eval("function f(a=(function () { })) { 'use strict'; }"); -}, SyntaxError); diff --git a/js/src/jit-test/tests/e4x/e4x-descendants-with-arguments.js b/js/src/jit-test/tests/e4x/e4x-descendants-with-arguments.js deleted file mode 100644 index fc64ffd8144..00000000000 --- a/js/src/jit-test/tests/e4x/e4x-descendants-with-arguments.js +++ /dev/null @@ -1,6 +0,0 @@ -function f() -{ - var x = <>; - x..arguments; -} -f(); diff --git a/js/src/jit-test/tests/e4x/testXMLPropertyNames.js b/js/src/jit-test/tests/e4x/testXMLPropertyNames.js deleted file mode 100644 index 36b0b317136..00000000000 --- a/js/src/jit-test/tests/e4x/testXMLPropertyNames.js +++ /dev/null @@ -1,11 +0,0 @@ -var o = {}; - -o.__defineGetter__(,function(){}); -.(o.__defineGetter__(new QName("foo"), function(){})); - -var i = 0; -for (w in o) { - ++i; -} - -assertEq(i, 2); diff --git a/js/src/jit-test/tests/ion/bug743099.js b/js/src/jit-test/tests/ion/bug743099.js index 5a51d4908d6..831a74fcacd 100644 --- a/js/src/jit-test/tests/ion/bug743099.js +++ b/js/src/jit-test/tests/ion/bug743099.js @@ -5,5 +5,5 @@ function WeekDay( t ) { } var expect = 'No Error'; for (var i = 0; i < 50; i++) { - var [] = expect ? WeekDay( i.a ) : isXMLName.anonymous(i), uneval; + var [] = expect ? WeekDay( i.a ) : true, uneval; } diff --git a/js/src/jit-test/tests/ion/bug758384.js b/js/src/jit-test/tests/ion/bug758384.js deleted file mode 100644 index 7703d73057c..00000000000 --- a/js/src/jit-test/tests/ion/bug758384.js +++ /dev/null @@ -1,7 +0,0 @@ -function TEST(section, expected, actual) {} -function TEST_XML(section, expected, actual) { - return TEST(section, expected, actual.toXMLString()); -} -x = new XML(""); -TEST_XML(2, "", x); -TEST_XML(3, "", x); diff --git a/js/src/jit-test/tests/ion/bug765480.js b/js/src/jit-test/tests/ion/bug765480.js index 79815630ace..fac2296e9dc 100644 --- a/js/src/jit-test/tests/ion/bug765480.js +++ b/js/src/jit-test/tests/ion/bug765480.js @@ -2,7 +2,7 @@ function fannkuch() { for (var j = 0; j < 50; j++) { for (var i = 0; i < 0; i++) { - arguments, XML; + arguments, Array; } } } diff --git a/js/src/jit-test/tests/ion/bug787921.js b/js/src/jit-test/tests/ion/bug787921.js index bcb5482e13d..7cf4af70406 100644 --- a/js/src/jit-test/tests/ion/bug787921.js +++ b/js/src/jit-test/tests/ion/bug787921.js @@ -3,7 +3,7 @@ function TestCase(n, d, e, a) { this.bugnumber = typeof(BUGNUMER) != 'undefined' ? BUGNUMBER : ''; this.type = (typeof window == 'undefined' ? 'shell' : 'browser'); gTestcases[gTc++] = this; - if (optionName && optionName != "allow_xml") {} + if (optionName) {} {} {} {} // Seems to be required to crash } function f() {} diff --git a/js/src/jit-test/tests/ion/throw.js b/js/src/jit-test/tests/ion/throw.js index 6908d06a941..bf0b5c73157 100644 --- a/js/src/jit-test/tests/ion/throw.js +++ b/js/src/jit-test/tests/ion/throw.js @@ -36,7 +36,7 @@ function getException(f) { function thrower2(x) { if (x > 90) throw x; - with (foo) {}; // Abort compilation... + with ({}) {}; // Abort compilation...(?) } function test2() { for (var i = 0; i < 100; i++) { diff --git a/js/src/jit-test/tests/jaeger/bug549398.js b/js/src/jit-test/tests/jaeger/bug549398.js index 32d9e4c4c99..7e18e43d77f 100644 --- a/js/src/jit-test/tests/jaeger/bug549398.js +++ b/js/src/jit-test/tests/jaeger/bug549398.js @@ -3,7 +3,7 @@ for(var z = 0 ; z < 2 ; ++z) {\ this\ }\ - ", ()) + ", ([1,2,3])) })() /* Don't crash. */ diff --git a/js/src/jit-test/tests/jaeger/bug553784.js b/js/src/jit-test/tests/jaeger/bug553784.js index 6bd60f748ff..85a298f4b13 100644 --- a/js/src/jit-test/tests/jaeger/bug553784.js +++ b/js/src/jit-test/tests/jaeger/bug553784.js @@ -1,6 +1,6 @@ // |jit-test| allow-oom (function(){ - (x)=> + (x)=[1,2,3] })() try{ (function(){ diff --git a/js/src/jit-test/tests/jaeger/bug576398.js b/js/src/jit-test/tests/jaeger/bug576398.js index 92c03001f22..82e2caaab30 100644 --- a/js/src/jit-test/tests/jaeger/bug576398.js +++ b/js/src/jit-test/tests/jaeger/bug576398.js @@ -1,5 +1,5 @@ function K(x) { - var dontCompile = ; + with ({}); // prevent compilation this.x = x; } function f() { diff --git a/js/src/jit-test/tests/jaeger/bug582880.js b/js/src/jit-test/tests/jaeger/bug582880.js index 0a8e5d07ffc..9d77df1f571 100644 --- a/js/src/jit-test/tests/jaeger/bug582880.js +++ b/js/src/jit-test/tests/jaeger/bug582880.js @@ -1,5 +1,4 @@ -x = -default xml namespace = []; +x = (function() {}) (function () { function a() {} a([7].some(gc)) diff --git a/js/src/jit-test/tests/jaeger/bug588338.js b/js/src/jit-test/tests/jaeger/bug588338.js index 65c30952077..bcef4a5412d 100644 --- a/js/src/jit-test/tests/jaeger/bug588338.js +++ b/js/src/jit-test/tests/jaeger/bug588338.js @@ -1,4 +1,4 @@ -// |jit-test| error: is not a function +// |jit-test| error: [1, 2, 3] is not a function function f() { (e) } (x = Proxy.createFunction((function(x) { return { @@ -10,5 +10,5 @@ function f() { (e) for (z = 0; z < 100; x.unwatch(), z++) for (e in [0]) { gczeal(2) -} ( )("") +} ( [1,2,3])("") diff --git a/js/src/jit-test/tests/jaeger/bug589108.js b/js/src/jit-test/tests/jaeger/bug589108.js index ecf369ad041..e1835ea2096 100644 --- a/js/src/jit-test/tests/jaeger/bug589108.js +++ b/js/src/jit-test/tests/jaeger/bug589108.js @@ -1,6 +1,6 @@ try { var x - for (x in >) + for (x in [x]) gczeal(2) new NaN } catch(e) {} diff --git a/js/src/jit-test/tests/jaeger/bug591602.js b/js/src/jit-test/tests/jaeger/bug591602.js index a6ba464c62d..5dd0b57dac7 100644 --- a/js/src/jit-test/tests/jaeger/bug591602.js +++ b/js/src/jit-test/tests/jaeger/bug591602.js @@ -12,7 +12,7 @@ try { (function() { let(y)((function() { try { let(c) o - } finally { (f, *::*) + } finally { (f, [1,2,3]) } })) })) diff --git a/js/src/jit-test/tests/jaeger/bug595921.js b/js/src/jit-test/tests/jaeger/bug595921.js index a5113adcb24..7f4933a2138 100644 --- a/js/src/jit-test/tests/jaeger/bug595921.js +++ b/js/src/jit-test/tests/jaeger/bug595921.js @@ -1,5 +1,5 @@ /* Don't assert. */ -x = +x = [1,2,3] function f(aaa) { aaa.e = x } diff --git a/js/src/jit-test/tests/jaeger/bug601982.js b/js/src/jit-test/tests/jaeger/bug601982.js index 7f5c93a3118..b78f0704c69 100644 --- a/js/src/jit-test/tests/jaeger/bug601982.js +++ b/js/src/jit-test/tests/jaeger/bug601982.js @@ -1,9 +1,9 @@ /* vim: set ts=4 sw=4 tw=99 et: */ function J(i) { - /* Cause a branch to build. */ + /* Cause a branch to build(?) */ if (i % 3) - + [1,2,3] } function h(i) { @@ -16,8 +16,8 @@ function h(i) { } function g(i) { - /* Method JIT will try to remove this frame. */ - if (i == 14) { } + /* Method JIT will try to remove this frame(?) */ + if (i == 14) { with ({}); } return h(i); } diff --git a/js/src/jit-test/tests/jaeger/bug656096.js b/js/src/jit-test/tests/jaeger/bug656096.js index 53090dc9f3f..63fdac76bae 100644 --- a/js/src/jit-test/tests/jaeger/bug656096.js +++ b/js/src/jit-test/tests/jaeger/bug656096.js @@ -20,7 +20,7 @@ function G(a, b, c, d, e, f) { if (c) g = [] else c = h.concat([], []) h.concat(g, d) - h.clamp(f, ) + h.clamp(f, [1,2,3]) } function decrypt(a, b, c, d, e) { G(a, 1, c, d, e, b) diff --git a/js/src/jit-test/tests/jaeger/bug732423.js b/js/src/jit-test/tests/jaeger/bug732423.js index fa09bbde763..7b9727623c7 100644 --- a/js/src/jit-test/tests/jaeger/bug732423.js +++ b/js/src/jit-test/tests/jaeger/bug732423.js @@ -1,10 +1,10 @@ -function testXML(x, y) { +function testStuff(x, y) { for (var i = 0; i < 60; i++) { x[y](); x[y]; } } -testXML(, "elements"); +testStuff({"elements":function(){}}, "elements"); var o = { res: 0, diff --git a/js/src/jit-test/tests/jaeger/inline/scripted-11.js b/js/src/jit-test/tests/jaeger/inline/scripted-11.js index 5097c1a0519..750add3980e 100644 --- a/js/src/jit-test/tests/jaeger/inline/scripted-11.js +++ b/js/src/jit-test/tests/jaeger/inline/scripted-11.js @@ -5,7 +5,6 @@ function f(x) { } function g(x) { - var a = ; eval("what = true"); } diff --git a/js/src/jit-test/tests/jaeger/recompile/bug646267.js b/js/src/jit-test/tests/jaeger/recompile/bug646267.js index 636fedd343e..2f150376758 100644 --- a/js/src/jit-test/tests/jaeger/recompile/bug646267.js +++ b/js/src/jit-test/tests/jaeger/recompile/bug646267.js @@ -5,4 +5,4 @@ function t(code) { t(""); t(""); t(""); -t("this.function::a = 7;"); +t("this.function = 7;"); diff --git a/js/src/jit-test/tests/jaeger/recompile/bug676764.js b/js/src/jit-test/tests/jaeger/recompile/bug676764.js index 1cb8ef8fd4a..fca27de64c1 100644 --- a/js/src/jit-test/tests/jaeger/recompile/bug676764.js +++ b/js/src/jit-test/tests/jaeger/recompile/bug676764.js @@ -1,5 +1,5 @@ -try { with( ) { +try { with( {"a":1} ) { (function () { for (;;) { t @@ -7,7 +7,7 @@ try { with( ) { })() } } catch (e) {} -with( ) { +with( {"b":2} ) { (function () { for (b = 0; b < 18; ++b) {} })(); diff --git a/js/src/jit-test/tests/jaeger/recompile/exotic.js b/js/src/jit-test/tests/jaeger/recompile/exotic.js index 81185c4dce3..3a00dd362fe 100644 --- a/js/src/jit-test/tests/jaeger/recompile/exotic.js +++ b/js/src/jit-test/tests/jaeger/recompile/exotic.js @@ -52,7 +52,7 @@ xfoo(function(a) { oglobal = a; return 10; }, [1]); xfoo(function(a) { oglobal = a; return 10; }, [1]); xfoo(function(a) { oglobal = a; return 10; }, [1]); assertEq(oglobal, 1); -xfoo(function(a) { ; oglobal = a; return 3; }, [true]); +xfoo(function(a) { [1,2,3]; oglobal = a; return 3; }, [true]); assertEq(oglobal, true); // Recompilation out of SplatApplyArgs.