JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2e9a3092d7 into 569757d14d

Browse Source
This commit is contained in:
Fábio Santos 2018-03-15 18:52:01 +00:00 committed by GitHub
commit bea614acd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 73 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compress.js
View File

@ -3074,8 +3074,12 @@ merge(Compressor.prototype, {
def(AST_Statement, return_null);
def(AST_Jump, return_this);
function block_aborts(){
var n = this.body.length;
return n > 0 && aborts(this.body[n - 1]);
for (var i = 0; i < this.body.length; i++) {
if (aborts(this.body[i])) {
return this.body[i];
}
}
return null;
};
def(AST_Import, function(){ return null; });
def(AST_BlockStatement, block_aborts);

57
test/compress/conditionals.js
View File

@ -1204,6 +1204,63 @@ issue_2560: {
]
}
issue_2994: {
options = {
conditionals: true,
if_return: true
}
input: {
function f(condition1, condition2, condition3) {
if (condition1) {
if (condition2) {
return aValue;
} else {
const variable1 = 'something';
if (condition3) {
const variable2 = 'else';
return anotherValue;
} else {
return undefined;
}
}
}
}
let aValue = 2, anotherValue = 3;
for (let i = 0; i < 8; ++i) {
console.log(f(i & 4, i & 2, i & 1));
}
}
expect: {
function f(condition1, condition2, condition3) {
if (condition1) {
if (condition2) return aValue;
{
const variable1 = "something";
if (condition3) {
const variable2 = "else";
return anotherValue;
}
return;
}
}
}
let aValue = 2, anotherValue = 3;
for (let i = 0; i < 8; ++i)
console.log(f(4 & i, 2 & i, 1 & i));
}
expect_stdout: [
"undefined",
"undefined",
"undefined",
"undefined",
"undefined",
"3",
"2",
"2",
]
node_version: ">=6"
}
hoist_decl: {
options = {
conditionals: true,

16
test/compress/issue-1034.js
View File

@ -69,15 +69,15 @@ non_hoisted_function_after_return_2a: {
"WARN: Declarations in unreachable code! [test/compress/issue-1034.js:48,16]",
"WARN: Dropping unreachable code [test/compress/issue-1034.js:51,16]",
"WARN: Declarations in unreachable code! [test/compress/issue-1034.js:51,16]",
"WARN: Dropping unused variable a [test/compress/issue-1034.js:48,20]",
"WARN: Dropping unused function nope [test/compress/issue-1034.js:55,21]",
"WARN: pass 0: last_count: Infinity, count: 37",
"WARN: Dropping unreachable code [test/compress/issue-1034.js:53,12]",
"WARN: Declarations in unreachable code! [test/compress/issue-1034.js:53,12]",
"WARN: Dropping unreachable code [test/compress/issue-1034.js:56,12]",
"WARN: Dropping unused variable a [test/compress/issue-1034.js:48,20]",
"WARN: Dropping unused variable b [test/compress/issue-1034.js:51,20]",
"WARN: Dropping unused variable c [test/compress/issue-1034.js:53,16]",
"WARN: pass 1: last_count: 37, count: 18",
"WARN: Dropping unused function nope [test/compress/issue-1034.js:55,21]",
"WARN: pass 0: last_count: Infinity, count: 23",
"WARN: pass 1: last_count: 23, count: 18",
]
}
@ -200,15 +200,15 @@ non_hoisted_function_after_return_2a_strict: {
"WARN: Declarations in unreachable code! [test/compress/issue-1034.js:175,16]",
"WARN: Dropping unreachable code [test/compress/issue-1034.js:178,16]",
"WARN: Declarations in unreachable code! [test/compress/issue-1034.js:178,16]",
"WARN: Dropping unused variable a [test/compress/issue-1034.js:175,20]",
"WARN: Dropping unused function nope [test/compress/issue-1034.js:182,21]",
"WARN: pass 0: last_count: Infinity, count: 48",
"WARN: Dropping unreachable code [test/compress/issue-1034.js:180,12]",
"WARN: Declarations in unreachable code! [test/compress/issue-1034.js:180,12]",
"WARN: Dropping unreachable code [test/compress/issue-1034.js:183,12]",
"WARN: Dropping unused variable a [test/compress/issue-1034.js:175,20]",
"WARN: Dropping unused variable b [test/compress/issue-1034.js:178,20]",
"WARN: Dropping unused variable c [test/compress/issue-1034.js:180,16]",
"WARN: pass 1: last_count: 48, count: 29",
"WARN: Dropping unused function nope [test/compress/issue-1034.js:182,21]",
"WARN: pass 0: last_count: Infinity, count: 34",
"WARN: pass 1: last_count: 34, count: 29",
]
}

4
test/run-tests.js
View File

@ -175,8 +175,8 @@ function run_compress_tests() {
if (expected_warnings != actual_warnings) {
log("!!! failed\n---INPUT---\n{input}\n---EXPECTED WARNINGS---\n{expected_warnings}\n---ACTUAL WARNINGS---\n{actual_warnings}\n\n", {
input: input_formatted,
expected_warnings: expected_warnings,
actual_warnings: actual_warnings,
expected_warnings: JSON.parse(expected_warnings).join('\n'),
actual_warnings: JSON.parse(actual_warnings).join('\n'),
});
return false;
}