Remove redundant Building.js_optimizer_no_asmjs. NFC. (#11015)

This method was always called with acorn=True so remove this argument
and unify with Building.acorn_optimizer.

Author: sbc100

emcc.py

@@ -2570,7 +2570,7 @@ def repl(m):
 
         # Minify the worker.js file in optimized builds
         if (shared.Settings.OPT_LEVEL >= 1 or shared.Settings.SHRINK_LEVEL >= 1) and not shared.Settings.DEBUG_LEVEL:
-          minified_worker = shared.Building.js_optimizer_no_asmjs(worker_output, ['minifyWhitespace'], acorn=True, return_output=True)
+          minified_worker = shared.Building.acorn_optimizer(worker_output, ['minifyWhitespace'], return_output=True)
           open(worker_output, 'w').write(minified_worker)
 
       # Generate the fetch.js worker script for multithreaded emscripten_fetch() support if targeting pthreads.

tests/test_other.py

@@ -2148,7 +2148,7 @@ def test_js_optimizer(self):
         expected = [expected]
       expected = [out.replace('\n\n', '\n').replace('\n\n', '\n') for out in expected]
 
-      acorn = any([p for p in passes if p in ACORN_PASSES])
+      acorn = any(p in ACORN_PASSES for p in passes)
 
       # test calling optimizer
       if not acorn:

tools/hacky_postprocess_around_closure_limitations.py

@@ -52,7 +52,7 @@
 
 # Finally, rerun minifier because the above changes may have left redundant whitespaces
 open(sys.argv[1], 'w').write(f)
-minified = shared.Building.js_optimizer_no_asmjs(sys.argv[1], ['minifyWhitespace'], acorn=True, return_output=True)
+minified = shared.Building.acorn_optimizer(sys.argv[1], ['minifyWhitespace'], return_output=True)
 open(sys.argv[1], 'w').write(minified)
 
 # optimized_size = len(f)

tools/shared.py

@@ -2031,11 +2031,8 @@ def js_optimizer(filename, passes, debug=False, extra_info=None, output_filename
 
   # run JS optimizer on some JS, ignoring asm.js contents if any - just run on it all
   @staticmethod
-  def js_optimizer_no_asmjs(filename, passes, return_output=False, extra_info=None, acorn=False):
-    if not acorn:
-      optimizer = path_from_root('tools', 'js-optimizer.js')
-    else:
-      optimizer = path_from_root('tools', 'acorn-optimizer.js')
+  def acorn_optimizer(filename, passes, extra_info=None, return_output=False):
+    optimizer = path_from_root('tools', 'acorn-optimizer.js')
     original_filename = filename
     if extra_info is not None:
       temp_files = configuration.get_temp_files()
@@ -2047,22 +2044,17 @@ def js_optimizer_no_asmjs(filename, passes, return_output=False, extra_info=None
     cmd = NODE_JS + [optimizer, filename] + passes
     # Keep JS code comments intact through the acorn optimization pass so that JSDoc comments
     # will be carried over to a later Closure run.
-    if acorn and Settings.USE_CLOSURE_COMPILER:
+    if Settings.USE_CLOSURE_COMPILER:
       cmd += ['--closureFriendly']
     if not return_output:
       next = original_filename + '.jso.js'
       configuration.get_temp_files().note(next)
       check_call(cmd, stdout=open(next, 'w'))
       next = Building.maybe_add_license(filename=next)
       return next
-    else:
-      output = check_call(cmd, stdout=PIPE).stdout
-      output = Building.maybe_add_license(code=output)
-      return output
-
-  @staticmethod
-  def acorn_optimizer(filename, passes, extra_info=None, return_output=False):
-    return Building.js_optimizer_no_asmjs(filename, passes, extra_info=extra_info, return_output=return_output, acorn=True)
+    output = check_call(cmd, stdout=PIPE).stdout
+    output = Building.maybe_add_license(code=output)
+    return output
 
   # evals ctors. if binaryen_bin is provided, it is the dir of the binaryen tool for this, and we are in wasm mode
   @staticmethod