consolidate simplifyExpressions to one pass that happens before closure, where simplifyNotComps is guaranteed to be valid

1 files changed, 1 insertions, 5 deletions

diff --git a/emcc b/emcc
index bfd97883..689e5a94 100755
--- a/emcc
+++ b/emcc
@@ -1578,7 +1578,7 @@ try:
       else:
         return 'eliminate'
 
-    js_optimizer_queue += [get_eliminate(), 'simplifyExpressionsPre']
+    js_optimizer_queue += [get_eliminate(), 'simplifyExpressions']
 
     if shared.Settings.RELOOP and not shared.Settings.ASM_JS:
       js_optimizer_queue += ['optimizeShiftsAggressive', get_eliminate()] # aggressive shifts optimization requires loops, it breaks on switches
@@ -1592,10 +1592,6 @@ try:
     final = shared.Building.closure_compiler(final)
     if DEBUG: save_intermediate('closure')
 
-  if opt_level >= 1:
-    logging.debug('running post-closure post-opts')
-    js_optimizer_queue += ['simplifyExpressionsPost']
-
   if shared.Settings.OUTLINING_LIMIT > 0:
     js_optimizer_queue += ['outline']
     js_optimizer_extra_info['sizeToOutline'] = shared.Settings.OUTLINING_LIMIT