From 7b22f2031fdbb778dac1968449b950290f6d9216 Mon Sep 17 00:00:00 2001
From: Mihai Bazon <mihai.bazon@gmail.com>
Date: Wed, 22 Apr 2015 17:34:49 +0300
Subject: [PATCH] If name_cache is specified, do rename cached properties

(even if --mangle-props is not there)
---
 bin/uglifyjs      | 7 ++++---
 lib/propmangle.js | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/uglifyjs b/bin/uglifyjs
index df7b7832..67db2979 100755
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -372,12 +372,13 @@ async.eachLimit(files, 1, function (file, cb) {
         TOPLEVEL = TOPLEVEL.wrap_enclose(arg_parameter_list);
     }
 
-    if (ARGS.mangle_props) (function(){
+    if (ARGS.mangle_props || ARGS.name_cache) (function(){
         var reserved = RESERVED ? RESERVED.props : null;
         var cache = readNameCache("props");
         TOPLEVEL = UglifyJS.mangle_properties(TOPLEVEL, {
-            reserved: reserved,
-            cache: cache
+            reserved   : reserved,
+            cache      : cache,
+            only_cache : !ARGS.mangle_props
         });
         writeNameCache("props", cache);
     })();
diff --git a/lib/propmangle.js b/lib/propmangle.js
index 46fb7521..8f291d64 100644
--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -63,7 +63,8 @@ function find_builtins() {
 function mangle_properties(ast, options) {
     options = defaults(options, {
         reserved : null,
-        cache : null
+        cache : null,
+        only_cache : false
     });
 
     var reserved = options.reserved;
@@ -139,6 +140,9 @@ function mangle_properties(ast, options) {
     // only function declarations after this line
 
     function can_mangle(name) {
+        if (options.only_cache) {
+            return cache.props.has(name);
+        }
         if (reserved.indexOf(name) >= 0) return false;
         if (/^[0-9.]+$/.test(name)) return false;
         return true;
-- 
2.34.1