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

enhance evaluate & reduce_vars (#3870)

Browse Source
This commit is contained in:
Alex Lam S.L
2020-05-10 11:38:32 +01:00
committed by GitHub
parent c4c9c6d37d
commit f9806b43c3
3 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/compress.js
View File

@@ -3302,19 +3302,23 @@ merge(Compressor.prototype, {
var non_converting_unary = makePredicate("! typeof void");
def(AST_UnaryPrefix, function(compressor, ignore_side_effects, cached, depth) {
var e = this.expression;
var op = this.operator;
// Function would be evaluated to an array and so typeof would
// incorrectly return 'object'. Hence making is a special case.
if (compressor.option("typeofs")
&& this.operator == "typeof"
&& op == "typeof"
&& (e instanceof AST_Lambda
|| e instanceof AST_SymbolRef
&& e.fixed_value() instanceof AST_Lambda)) {
return typeof function(){};
}
if (!non_converting_unary[this.operator]) depth++;
if (!non_converting_unary[op]) depth++;
var v = e._eval(compressor, ignore_side_effects, cached, depth);
if (v === this.expression) return this;
switch (this.operator) {
if (v === e) {
if (ignore_side_effects && op == "void") return void 0;
return this;
}
switch (op) {
case "!": return !v;
case "typeof":
// typeof <RegExp> returns "object" or "function" on different platforms
@@ -3330,7 +3334,7 @@ merge(Compressor.prototype, {
if (!(e instanceof AST_SymbolRef)) return this;
var refs = e.definition().references;
if (refs[refs.length - 1] !== e) return this;
return HOP(e, "_eval") ? +(this.operator[0] + 1) + +v : v;
return HOP(e, "_eval") ? +(op[0] + 1) + +v : v;
}
return this;
});
@@ -7500,9 +7504,13 @@ merge(Compressor.prototype, {
init = fixed;
}
} else {
var ev = fixed.evaluate(compressor);
if (ev !== fixed && (!(ev instanceof RegExp)
|| compressor.option("unsafe_regexp") && !def.cross_loop && same_scope(def))) {
var ev = fixed.evaluate(compressor, true);
if (ev !== fixed
&& typeof ev != "function"
&& (typeof ev != "object"
|| ev instanceof RegExp
&& compressor.option("unsafe_regexp")
&& !def.cross_loop && same_scope(def))) {
init = make_node_from_constant(ev, fixed);
}
}