Skip to content

Commit

Permalink
fix corner case in reuse of mangle options (#3062)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexlamsl committed Apr 7, 2018
1 parent 8d0b003 commit e5f6a88
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ function next_mangled_name(scope, options, def) {
}
while (true) {
name = base54(++scope.cname);
if (in_use[name] || !is_identifier(name) || options._reserved[name]) continue;
if (in_use[name] || !is_identifier(name) || options.reserved.has[name]) continue;
if (!names[name]) break;
holes.push(scope.cname);
}
Expand Down Expand Up @@ -387,7 +387,7 @@ function _default_mangler_options(options) {
if (!Array.isArray(options.reserved)) options.reserved = [];
// Never mangle arguments
push_uniq(options.reserved, "arguments");
options._reserved = makePredicate(options.reserved);
options.reserved.has = makePredicate(options.reserved);
return options;
}

Expand Down Expand Up @@ -453,7 +453,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
redefined.forEach(mangle);

function mangle(def) {
if (options._reserved[def.name]) return;
if (options.reserved.has[def.name]) return;
def.mangle(options);
}
});
Expand Down Expand Up @@ -504,7 +504,7 @@ AST_Toplevel.DEFMETHOD("expand_names", function(options) {
function rename(def) {
if (def.global && options.cache) return;
if (def.unmangleable(options)) return;
if (options._reserved[def.name]) return;
if (options.reserved.has[def.name]) return;
var d = def.redefined();
def.name = d ? d.name : next_name();
def.orig.forEach(function(sym) {
Expand Down

0 comments on commit e5f6a88

Please sign in to comment.