rename MINIFY_INFO to EXTRA_INFO in preparation for further uses

2 files changed, 22 insertions, 22 deletions

diff --git a/tools/js-optimizer.js b/tools/js-optimizer.js
index 5d7704d7..7f0c97ba 100644
--- a/tools/js-optimizer.js
+++ b/tools/js-optimizer.js
@@ -143,7 +143,7 @@ var FALSE_NODE = ['unary-prefix', '!', ['num', 1]];
 var GENERATED_FUNCTIONS_MARKER = '// EMSCRIPTEN_GENERATED_FUNCTIONS';
 var generatedFunctions = false; // whether we have received only generated functions
 
-var minifierInfo = null;
+var extraInfo = null;
 
 function srcToAst(src) {
   return uglify.parser.parse(src);
@@ -1634,7 +1634,7 @@ function denormalizeAsm(func, data) {
 
 // Very simple 'registerization', coalescing of variables into a smaller number,
 // as part of minification. Globals-level minification began in a previous pass,
-// we receive minifierInfo which tells us how to rename globals. (Only in asm.js.)
+// we receive extraInfo which tells us how to rename globals. (Only in asm.js.)
 //
 // We do not optimize when there are switches, so this pass only makes sense with
 // relooping.
@@ -1676,7 +1676,7 @@ function registerize(ast) {
       }
     });
     vacuum(fun);
-    if (minifierInfo) {
+    if (extraInfo) {
       assert(asm);
       var usedGlobals = {};
       var nextLocal = 0;
@@ -1684,7 +1684,7 @@ function registerize(ast) {
       traverse(fun, function(node, type) {
         if (type == 'name') {
           var name = node[1];
-          var minified = minifierInfo.globals[name];
+          var minified = extraInfo.globals[name];
           if (minified) {
             assert(!localVars[name], name); // locals must not shadow globals, or else we don't know which is which
             if (localVars[minified]) {
@@ -1717,8 +1717,8 @@ function registerize(ast) {
           }
         }
       });
-      assert(fun[1] in minifierInfo.globals, fun[1]);
-      fun[1] = minifierInfo.globals[fun[1]];
+      assert(fun[1] in extraInfo.globals, fun[1]);
+      fun[1] = extraInfo.globals[fun[1]];
       assert(fun[1]);
       var nextRegName = 0;
     }
@@ -1726,14 +1726,14 @@ function registerize(ast) {
     function getNewRegName(num, name) {
       if (!asm) return 'r' + num;
       var type = asmData.vars[name];
-      if (!minifierInfo) {
+      if (!extraInfo) {
         var ret = (type ? 'd' : 'i') + num;
         regTypes[ret] = type;
         return ret;
       }
       // find the next free minified name that is not used by a global that shows up in this function
-      while (nextRegName < minifierInfo.names.length) {
-        var ret = minifierInfo.names[nextRegName++];
+      while (nextRegName < extraInfo.names.length) {
+        var ret = extraInfo.names[nextRegName++];
         if (!usedGlobals[ret]) {
           regTypes[ret] = type;
           return ret;
@@ -2690,16 +2690,16 @@ function minifyGlobals(ast) {
       var vars = node[1];
       for (var i = 0; i < vars.length; i++) {
         var name = vars[i][0];
-        assert(next < minifierInfo.names.length);
-        vars[i][0] = minified[name] = minifierInfo.names[next++];
+        assert(next < extraInfo.names.length);
+        vars[i][0] = minified[name] = extraInfo.names[next++];
       }
     }
   });
   // add all globals in function chunks, i.e. not here but passed to us
-  for (var i = 0; i < minifierInfo.globals.length; i++) {
-    name = minifierInfo.globals[i];
-    assert(next < minifierInfo.names.length);
-    minified[name] = minifierInfo.names[next++];
+  for (var i = 0; i < extraInfo.globals.length; i++) {
+    name = extraInfo.globals[i];
+    assert(next < extraInfo.names.length);
+    minified[name] = extraInfo.names[next++];
   }
   // apply minification
   traverse(ast, function(node, type) {
@@ -2710,7 +2710,7 @@ function minifyGlobals(ast) {
       }
     }
   });
-  suffix = '// MINIFY_INFO:' + JSON.stringify(minified);
+  suffix = '// EXTRA_INFO:' + JSON.stringify(minified);
 }
 
 // Change +5 to DOT$ZERO(5). We then textually change 5 to 5.0 (uglify's ast cannot differentiate between 5 and 5.0 directly)
@@ -2791,9 +2791,9 @@ var src = read(arguments_[0]);
 var ast = srcToAst(src);
 //printErr(JSON.stringify(ast)); throw 1;
 generatedFunctions = src.indexOf(GENERATED_FUNCTIONS_MARKER) >= 0;
-var minifierInfoStart = src.indexOf('// MINIFY_INFO:')
-if (minifierInfoStart > 0) minifierInfo = JSON.parse(src.substr(minifierInfoStart + 15));
-//printErr(JSON.stringify(minifierInfo));
+var extraInfoStart = src.indexOf('// EXTRA_INFO:')
+if (extraInfoStart > 0) extraInfo = JSON.parse(src.substr(extraInfoStart + 14));
+//printErr(JSON.stringify(extraInfo));
 
 arguments_.slice(1).forEach(function(arg) {
   passes[arg](ast);
diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py
index 9dd3bff5..16bc73c1 100644
--- a/tools/js_optimizer.py
+++ b/tools/js_optimizer.py
@@ -73,13 +73,13 @@ class Minifier:
     f = open(temp_file, 'w')
     f.write(shell)
     f.write('\n')
-    f.write('// MINIFY_INFO:' + self.serialize())
+    f.write('// EXTRA_INFO:' + self.serialize())
     f.close()
 
     output = subprocess.Popen(self.js_engine + [JS_OPTIMIZER, temp_file, 'minifyGlobals', 'noPrintMetadata'] + (['minifyWhitespace'] if minify_whitespace else []), stdout=subprocess.PIPE).communicate()[0]
     assert len(output) > 0 and not output.startswith('Assertion failed'), 'Error in js optimizer: ' + output
     #print >> sys.stderr, "minified SHELL 3333333333333333", output, "\n44444444444444444444"
-    code, metadata = output.split('// MINIFY_INFO:')
+    code, metadata = output.split('// EXTRA_INFO:')
     self.globs = json.loads(metadata)
     return code.replace('13371337', '0.0')
 
@@ -243,7 +243,7 @@ EMSCRIPTEN_FUNCS();
       f.write(suffix_marker)
       if minify_globals:
         f.write('\n')
-        f.write('// MINIFY_INFO:' + minify_info)
+        f.write('// EXTRA_INFO:' + minify_info)
       f.close()
       return temp_file
     filenames = [write_chunk(chunks[i], i) for i in range(len(chunks))]