| Index: test/mjsunit/compiler/short-circuit.js
|
| diff --git a/test/mjsunit/compiler/short-circuit.js b/test/mjsunit/compiler/short-circuit.js
|
| index 42100e765d55d5e988af0207d041aa46891f01aa..b24683668bdda930e3e40fc618e0f1b8fa0c3cf0 100644
|
| --- a/test/mjsunit/compiler/short-circuit.js
|
| +++ b/test/mjsunit/compiler/short-circuit.js
|
| @@ -32,63 +32,63 @@
|
| var x = 42;
|
|
|
| // Literals in value/test context.
|
| -assertEquals(x, function () { return 0 || x }());
|
| -assertEquals(1, function () { return 1 || x }());
|
| +assertEquals(x, function () { return 0 || x; }());
|
| +assertEquals(1, function () { return 1 || x; }());
|
|
|
| // Literals in test/value context.
|
| -assertEquals(0, function () { return 0 && x }());
|
| -assertEquals(x, function () { return 1 && x }());
|
| +assertEquals(0, function () { return 0 && x; }());
|
| +assertEquals(x, function () { return 1 && x; }());
|
|
|
| // A value on top of the stack in value/test context.
|
| -assertEquals(x, function(y) { return y++ || x }(0));
|
| -assertEquals(1, function(y) { return y++ || x }(1));
|
| +assertEquals(x, function(y) { return y++ || x; }(0));
|
| +assertEquals(1, function(y) { return y++ || x; }(1));
|
|
|
| // A value on top of the stack in a test/value context.
|
| -assertEquals(0, function(y) { return y++ && x }(0));
|
| -assertEquals(x, function(y) { return y++ && x }(1));
|
| +assertEquals(0, function(y) { return y++ && x; }(0));
|
| +assertEquals(x, function(y) { return y++ && x; }(1));
|
|
|
| // An object literal in value context.
|
| -assertEquals(0, function () { return {x: 0}}().x);
|
| +assertEquals(0, function () { return {x: 0};}().x);
|
|
|
| // An object literal in value/test context.
|
| -assertEquals(0, function () { return {x: 0} || this }().x);
|
| +assertEquals(0, function () { return {x: 0} || this; }().x);
|
|
|
| // An object literal in test/value context.
|
| -assertEquals(x, function () { return {x: 0} && this }().x);
|
| +assertEquals(x, function () { return {x: 0} && this; }().x);
|
|
|
| // An array literal in value/test context.
|
| -assertEquals(0, function () { return [0,1] || new Array(x,1) }()[0]);
|
| +assertEquals(0, function () { return [0,1] || new Array(x,1); }()[0]);
|
|
|
| // An array literal in test/value context.
|
| -assertEquals(x, function () { return [0,1] && new Array(x,1) }()[0]);
|
| +assertEquals(x, function () { return [0,1] && new Array(x,1); }()[0]);
|
|
|
| // Slot assignment in value/test context.
|
| -assertEquals(x, function (y) { return (y = 0) || x }("?"));
|
| -assertEquals(1, function (y) { return (y = 1) || x }("?"));
|
| +assertEquals(x, function (y) { return (y = 0) || x; }("?"));
|
| +assertEquals(1, function (y) { return (y = 1) || x; }("?"));
|
|
|
| // Slot assignment in test/value context.
|
| -assertEquals(0, function (y) { return (y = 0) && x }("?"));
|
| -assertEquals(x, function (y) { return (y = 1) && x }("?"));
|
| +assertEquals(0, function (y) { return (y = 0) && x; }("?"));
|
| +assertEquals(x, function (y) { return (y = 1) && x; }("?"));
|
|
|
| // void in value context.
|
| -assertEquals(void 0, function () { return void x }());
|
| +assertEquals(void 0, function () { return void x; }());
|
|
|
| // void in value/test context.
|
| -assertEquals(x, function () { return (void x) || x }());
|
| +assertEquals(x, function () { return (void x) || x; }());
|
|
|
| // void in test/value context.
|
| -assertEquals(void 0, function () { return (void x) && x }());
|
| +assertEquals(void 0, function () { return (void x) && x; }());
|
|
|
| // Unary not in value context.
|
| -assertEquals(false, function () { return !x }());
|
| +assertEquals(false, function () { return !x; }());
|
|
|
| // Unary not in value/test context.
|
| -assertEquals(true, function (y) { return !y || x }(0));
|
| -assertEquals(x, function (y) { return !y || x }(1));
|
| +assertEquals(true, function (y) { return !y || x; }(0));
|
| +assertEquals(x, function (y) { return !y || x; }(1));
|
|
|
| // Unary not in test/value context.
|
| -assertEquals(x, function (y) { return !y && x }(0));
|
| -assertEquals(false, function (y) { return !y && x }(1));
|
| +assertEquals(x, function (y) { return !y && x; }(0));
|
| +assertEquals(false, function (y) { return !y && x; }(1));
|
|
|
| // Comparison in value context.
|
| assertEquals(false, function () { return x < x; }());
|
|
|