transform function calls to IIFEs (#1560)

- expose function body to call sites for potential optimisations
- suppress substitution of variable used within `AST_Defun`
This commit is contained in:
Alex Lam S.L
2017-03-07 15:37:52 +08:00
committed by GitHub
parent d787d70127
commit 8153b7bd8a
5 changed files with 284 additions and 29 deletions

View File

@@ -744,12 +744,11 @@ toplevel_on_loops_1: {
while (x);
}
expect: {
function bar() {
console.log("bar:", --x);
}
var x = 3;
do
bar();
(function() {
console.log("bar:", --x);
})();
while (x);
}
}
@@ -800,10 +799,9 @@ toplevel_on_loops_2: {
while (x);
}
expect: {
function bar() {
for (;;) (function() {
console.log("bar:");
}
for (;;) bar();
})();
}
}
@@ -869,3 +867,229 @@ toplevel_off_loops_3: {
for (;x;) bar();
}
}
defun_reference: {
options = {
evaluate: true,
reduce_vars: true,
}
input: {
function f() {
function g() {
x();
return a;
}
var a = h();
var b = 2;
return a + b;
function h() {
y();
return b;
}
}
}
expect: {
function f() {
function g() {
x();
return a;
}
var a = h();
var b = 2;
return a + b;
function h() {
y();
return b;
}
}
}
}
defun_inline_1: {
options = {
reduce_vars: true,
unused: true,
}
input: {
function f() {
return g(2) + h();
function g(b) {
return b;
}
function h() {
return h();
}
}
}
expect: {
function f() {
return function(b) {
return b;
}(2) + h();
function h() {
return h();
}
}
}
}
defun_inline_2: {
options = {
reduce_vars: true,
unused: true,
}
input: {
function f() {
function g(b) {
return b;
}
function h() {
return h();
}
return g(2) + h();
}
}
expect: {
function f() {
function h() {
return h();
}
return function(b) {
return b;
}(2) + h();
}
}
}
defun_inline_3: {
options = {
evaluate: true,
passes: 2,
reduce_vars: true,
side_effects: true,
unused: true,
}
input: {
function f() {
return g(2);
function g(b) {
return b;
}
}
}
expect: {
function f() {
return 2;
}
}
}
defun_call: {
options = {
reduce_vars: true,
unused: true,
}
input: {
function f() {
return g() + h(1) - h(g(), 2, 3);
function g() {
return 4;
}
function h(a) {
return a;
}
}
}
expect: {
function f() {
return 4 + h(1) - h(4);
function h(a) {
return a;
}
}
}
}
defun_redefine: {
options = {
reduce_vars: true,
unused: true,
}
input: {
function f() {
function g() {
return 1;
}
function h() {
return 2;
}
g = function() {
return 3;
};
return g() + h();
}
}
expect: {
function f() {
function g() {
return 1;
}
g = function() {
return 3;
};
return g() + 2;
}
}
}
func_inline: {
options = {
reduce_vars: true,
unused: true,
}
input: {
function f() {
var g = function() {
return 1;
};
console.log(g() + h());
var h = function() {
return 2;
};
}
}
expect: {
function f() {
console.log(1 + h());
var h = function() {
return 2;
};
}
}
}
func_modified: {
options = {
reduce_vars: true,
unused: true,
}
input: {
function f(a) {
function a() { return 1; }
function b() { return 2; }
function c() { return 3; }
b.inject = [];
c = function() { return 4; };
return a() + b() + c();
}
}
expect: {
function f(a) {
function b() { return 2; }
function c() { return 3; }
b.inject = [];
c = function() { return 4; };
return 1 + 2 + c();
}
}
}

View File

@@ -82,7 +82,7 @@ describe("bin/uglifyjs", function () {
});
});
it("Should work with --keep-fnames (mangle & compress)", function (done) {
var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m -c';
var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m -c unused=false';
exec(command, function (err, stdout) {
if (err) throw err;

View File

@@ -3,17 +3,13 @@ var assert = require("assert");
describe("minify() with input file globs", function() {
it("minify() with one input file glob string.", function() {
var result = Uglify.minify("test/input/issue-1242/foo.*", {
compress: { collapse_vars: true }
});
var result = Uglify.minify("test/input/issue-1242/foo.*");
assert.strictEqual(result.code, 'function foo(o){print("Foo:",2*o)}var print=console.log.bind(console);');
});
it("minify() with an array of one input file glob.", function() {
var result = Uglify.minify([
"test/input/issue-1242/b*.es5",
], {
compress: { collapse_vars: true }
});
]);
assert.strictEqual(result.code, 'function bar(n){return 3*n}function baz(n){return n/2}');
});
it("minify() with an array of multiple input file globs.", function() {
@@ -21,8 +17,8 @@ describe("minify() with input file globs", function() {
"test/input/issue-1242/???.es5",
"test/input/issue-1242/*.js",
], {
compress: { collapse_vars: true }
compress: { toplevel: true }
});
assert.strictEqual(result.code, 'function bar(n){return 3*n}function baz(n){return n/2}function foo(n){print("Foo:",2*n)}var print=console.log.bind(console);print("qux",bar(3),baz(12)),foo(11);');
assert.strictEqual(result.code, 'var print=console.log.bind(console);print("qux",function(n){return 3*n}(3),function(n){return n/2}(12)),function(n){print("Foo:",2*n)}(11);');
});
});