inline by default, now that lto is off by default

5 files changed, 288 insertions, 12 deletions

diff --git a/emcc b/emcc
index 3fa580fd..30074540 100755
--- a/emcc
+++ b/emcc
@@ -189,7 +189,6 @@ Options that are modified or new in %s include:
   -O3                      As -O2, plus dangerous optimizations that may
                            break the generated code! This adds
 
-                              -s INLINING_LIMIT=0
                               -s DOUBLE_MODE=0
                               -s PRECISE_I64_MATH=0
                               --closure 1
diff --git a/src/settings.js b/src/settings.js
index 82cbebe4..3fd31326 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -107,10 +107,11 @@ var SKIP_STACK_IN_SMALL = 1; // When enabled, does not push/pop the stack at all
                              // In particular, be careful with the autodebugger! (We do turn
                              // this off automatically in that case, though.)
 var INLINE_LIBRARY_FUNCS = 1; // Will inline library functions that have __inline defined
-var INLINING_LIMIT = 50; // A limit on inlining. If 0, we will inline normally in LLVM and
+var INLINING_LIMIT = 0;  // A limit on inlining. If 0, we will inline normally in LLVM and
                          // closure. If greater than 0, we will *not* inline in LLVM, and
                          // we will prevent inlining of functions of this size or larger
-                         // in closure.
+                         // in closure. 50 is a reasonable setting if you do not want
+                         // inlining
 var CATCH_EXIT_CODE = 0; // If set, causes exit() to throw an exception object which is caught
                          // in a try..catch block and results in the exit status being
                          // returned from run(). If zero (the default), the program is just
diff --git a/tests/bullet/output3.txt b/tests/bullet/output3.txt
new file mode 100644
index 00000000..78f27f9f
--- /dev/null
+++ b/tests/bullet/output3.txt
@@ -0,0 +1,270 @@
+world pos = 2.00,10.00,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.99,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.98,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.97,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.96,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.94,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.92,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.90,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.88,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.85,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.82,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.78,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.75,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.71,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.67,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.62,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.57,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.52,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.47,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.42,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.36,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.30,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.23,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.17,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.10,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,9.02,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.95,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.87,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.79,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.71,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.62,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.53,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.44,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.35,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.25,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.15,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,8.05,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.94,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.83,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.72,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.61,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.49,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.37,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.25,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.13,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,7.00,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.87,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.73,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.60,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.46,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.32,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.17,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,6.03,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,5.88,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,5.72,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,5.57,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,5.41,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,5.25,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,5.08,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,4.92,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,4.75,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,4.58,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,4.40,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,4.22,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,4.04,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,3.86,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,3.67,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,3.48,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,3.29,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,3.10,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,2.90,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,2.70,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,2.50,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,2.29,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,2.08,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,1.87,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,1.66,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,1.44,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,1.22,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,1.00,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,0.77,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,0.55,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,0.32,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,0.08,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-0.15,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-0.39,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-0.63,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-0.88,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-1.13,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-1.38,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-1.63,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-1.88,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-2.14,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-2.40,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-2.67,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-2.93,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-3.20,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-3.48,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-3.75,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.03,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.31,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.59,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.88,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.17,0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.13,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.10,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.08,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.05,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.03,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.01,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.99,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.98,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.97,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.96,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.95,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.95,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.95,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.95,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.96,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.97,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.98,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-4.99,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
+world pos = 2.00,-5.00,-0.00
+world pos = 0.00,-56.00,0.00
diff --git a/tests/runner.py b/tests/runner.py
index b5f7cd6c..7e720fe4 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -1820,6 +1820,8 @@ Succeeded!
         generated = open('src.cpp.o.js', 'r').read()
 
     def test_stack(self):
+        Settings.INLINING_LIMIT = 50
+
         src = '''
           #include <stdio.h>
           int test(int i) {
@@ -3069,6 +3071,8 @@ Exiting setjmp function, level: 0, prev_jmp: -1
     def test_stack_varargs(self):
       if self.emcc_args is None: return # too slow in other modes
 
+      Settings.INLINING_LIMIT = 50
+
       # We should not blow up the stack with numerous varargs
       src = r'''
         #include <stdio.h>
@@ -3089,6 +3093,8 @@ Exiting setjmp function, level: 0, prev_jmp: -1
       self.do_run(src, 'ok!')
 
     def test_stack_void(self):
+      Settings.INLINING_LIMIT = 50
+
       src = r'''
         #include <stdio.h>
 
@@ -6952,6 +6958,7 @@ def process(filename):
       # gcc -O3 -I/home/alon/Dev/emscripten/tests/sqlite -ldl src.c
       if self.emcc_args is None: return self.skip('Very slow without ta2, and we would also need to include dlmalloc manually without emcc')
       if Settings.QUANTUM_SIZE == 1: return self.skip('TODO FIXME')
+      self.banned_js_engines = [NODE_JS] # OOM in older node
 
       Settings.CORRECT_SIGNS = 1
       Settings.CORRECT_OVERFLOWS = 0
@@ -6997,7 +7004,8 @@ def process(filename):
 
       self.do_run(open(path_from_root('tests', 'bullet', 'Demos', 'HelloWorld', 'HelloWorld.cpp'), 'r').read(),
                    [open(path_from_root('tests', 'bullet', 'output.txt'), 'r').read(), # different roundings
-                    open(path_from_root('tests', 'bullet', 'output2.txt'), 'r').read()],
+                    open(path_from_root('tests', 'bullet', 'output2.txt'), 'r').read(),
+                    open(path_from_root('tests', 'bullet', 'output3.txt'), 'r').read()],
                    libraries=self.get_library('bullet', [os.path.join('src', '.libs', 'libBulletDynamics.a'),
                                                           os.path.join('src', '.libs', 'libBulletCollision.a'),
                                                           os.path.join('src', '.libs', 'libLinearMath.a')],
@@ -8521,7 +8529,6 @@ Options that are modified or new in %s include:
               assert re.search('HEAP8\[\$?\w+ \+ \(+\$?\w+ ', generated) or re.search('HEAP8\[HEAP32\[', generated), 'eliminator should create compound expressions, and fewer one-time vars' # also in -O1, but easier to test in -O2
             assert ('_puts(' in generated) == (opt_level >= 1), 'with opt >= 1, llvm opts are run and they should optimize printf to puts'
             assert 'function _main() {' in generated, 'Should be unminified, including whitespace'
-            assert ('-O3' in (params+(bc_params or []))) or'function _dump' in generated, 'No inlining by default'
 
         # emcc -s RELOOP=1 src.cpp ==> should pass -s to emscripten.py. --typed-arrays is a convenient alias for -s USE_TYPED_ARRAYS
         for params, test, text in [
@@ -9689,25 +9696,25 @@ seeked= file.
             }
           ''')
           out, err = Popen([PYTHON, EMCC, self.in_dir('main.cpp'), '-O2', '-o', 'main.o'], stdout=PIPE, stderr=PIPE).communicate()
-          assert ("emcc: LLVM opts: ['-disable-inlining', '-O3']" in err) == optimize_normally
+          assert ("emcc: LLVM opts: ['-O3']" in err) == optimize_normally
           assert (' with -O3 since EMCC_OPTIMIZE_NORMALLY defined' in err) == optimize_normally
 
           out, err = Popen([PYTHON, EMCC, self.in_dir('supp.cpp'), '-O2', '-o', 'supp.o'], stdout=PIPE, stderr=PIPE).communicate()
-          assert ("emcc: LLVM opts: ['-disable-inlining', '-O3']" in err) == optimize_normally
+          assert ("emcc: LLVM opts: ['-O3']" in err) == optimize_normally
           assert (' with -O3 since EMCC_OPTIMIZE_NORMALLY defined' in err) == optimize_normally
 
           out, err = Popen([PYTHON, EMCC, self.in_dir('main.o'), self.in_dir('supp.o'), '-O2', '-o', 'both.o'], stdout=PIPE, stderr=PIPE).communicate()
-          assert "emcc: LLVM opts: ['-disable-inlining', '-O3']" not in err
+          assert "emcc: LLVM opts: ['-O3']" not in err
           assert ' with -O3 since EMCC_OPTIMIZE_NORMALLY defined' not in err
           assert ('despite EMCC_OPTIMIZE_NORMALLY since not source code' in err) == optimize_normally
 
           out, err = Popen([PYTHON, EMCC, self.in_dir('main.cpp'), self.in_dir('supp.cpp'), '-O2', '-o', 'both2.o'], stdout=PIPE, stderr=PIPE).communicate()
-          assert ("emcc: LLVM opts: ['-disable-inlining', '-O3']" in err) == optimize_normally
+          assert ("emcc: LLVM opts: ['-O3']" in err) == optimize_normally
           assert (' with -O3 since EMCC_OPTIMIZE_NORMALLY defined' in err) == optimize_normally
 
           for last in ['both.o', 'both2.o']:
             out, err = Popen([PYTHON, EMCC, self.in_dir('both.o'), '-O2', '-o', last + '.js'], stdout=PIPE, stderr=PIPE).communicate()
-            assert ("emcc: LLVM opts: ['-disable-inlining', '-O3']" not in err) == optimize_normally
+            assert ("emcc: LLVM opts: ['-O3']" not in err) == optimize_normally
             assert ' with -O3 since EMCC_OPTIMIZE_NORMALLY defined' not in err
             output = run_js(last + '.js')
             assert 'yello' in output, 'code works'
diff --git a/tools/shared.py b/tools/shared.py
index 524145fa..3912245d 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -574,8 +574,7 @@ class Settings:
         if opt_level >= 2:
           Settings.RELOOP = 1
         if opt_level >= 3:
-          # Aside from these, -O3 also runs closure compiler
-          Settings.INLINING_LIMIT = 0
+          # Aside from these, -O3 also runs closure compiler and llvm lto
           Settings.DOUBLE_MODE = 0
           Settings.PRECISE_I64_MATH = 0
           if noisy: print >> sys.stderr, 'Warning: Applying some potentially unsafe optimizations! (Use -O2 if this fails.)'