Merge branch 'incoming' into llvm-3.41.8.6

Conflicts:
	tests/test_benchmark.py
	tools/shared.py

1 files changed, 3 insertions, 0 deletions

diff --git a/emcc b/emcc
index 45f16039..00cf3f06 100755
--- a/emcc
+++ b/emcc
@@ -1916,6 +1916,9 @@ try:
 
     js_optimizer_queue += [get_eliminate()]
 
+    if shared.Settings.AGGRESSIVE_VARIABLE_ELIMINATION:
+      js_optimizer_queue += ['aggressiveVariableElimination']
+
     if opt_level >= 2:
       js_optimizer_queue += ['simplifyExpressions']