LLVM 4.0

AUTHORS

@@ -269,6 +269,7 @@ a license to everyone to use it as detailed in LICENSE.)
 * Vilibald Wanča <vilibald@wvi.cz>
 * Alex Hixon <alex@alexhixon.com>
 * Vladimir Davidovich <thy.ringo@gmail.com>
+* Dylan McKay <dylanmckay34@gmail.com>
 * Christophe Gragnic <cgragnic@netc.fr>
 * Murphy McCauley <murphy.mccauley@gmail.com>
 * Anatoly Trosinenko <anatoly.trosinenko@gmail.com>

emscripten.py

@@ -132,9 +132,9 @@ def get_and_parse_backend(infile, settings, temp_files, DEBUG):
       backend_args += ['-emscripten-stack-size=%d' % settings['TOTAL_STACK']]
       backend_args += ['-O' + str(settings['OPT_LEVEL'])]
       if settings['DISABLE_EXCEPTION_CATCHING'] != 1:
-        backend_args += ['-enable-emscripten-cxx-exceptions']
+        backend_args += ['-enable-emscripten-cpp-exceptions']
         if settings['DISABLE_EXCEPTION_CATCHING'] == 2:
-          backend_args += ['-emscripten-cxx-exceptions-whitelist=' + ','.join(settings['EXCEPTION_CATCHING_WHITELIST'] or ['fake'])]
+          backend_args += ['-emscripten-cpp-exceptions-whitelist=' + ','.join(settings['EXCEPTION_CATCHING_WHITELIST'] or ['fake'])]
       if settings['ASYNCIFY']:
         backend_args += ['-emscripten-asyncify']
         backend_args += ['-emscripten-asyncify-functions=' + ','.join(settings['ASYNCIFY_FUNCTIONS'])]

tests/test_browser.py

@@ -2942,7 +2942,7 @@ def test_pthread_atomics(self):
 
   # Test 64-bit atomics.
   def test_pthread_64bit_atomics(self):
-    self.btest(path_from_root('tests', 'pthread', 'test_pthread_64bit_atomics.cpp'), expected='0', args=['-O3', '-s', 'USE_PTHREADS=2', '--separate-asm', '-s', 'PTHREAD_POOL_SIZE=8'], timeout=30)
+    self.btest(path_from_root('tests', 'pthread', 'test_pthread_64bit_atomics.cpp'), expected='0', args=['-O3', '-s', 'USE_PTHREADS=2', '--separate-asm', '-s', 'PTHREAD_POOL_SIZE=8'], timeout=90)
 
   # Test 64-bit C++11 atomics.
   def test_pthread_64bit_cxx11_atomics(self):

tests/test_core.py

@@ -5820,7 +5820,8 @@ def test_dead_functions(self):
       #include <stdio.h>
       extern "C" {
       __attribute__((noinline)) int unused(int x) {
-        return x;
+        volatile int y = x;
+        return y;
       }
       }
       int main(int argc, char **argv) {

tests/test_other.py

@@ -943,8 +943,8 @@ def measure_funcs(filename):
     for test_opts, expected_ranges in [
       ([], {
          100: (150, 500),
-         250: (150, 600),
-         500: (150, 700),
+         250: (150, 800),
+         500: (150, 900),
         1000: (200, 1000),
         2000: (250, 2000),
         5000: (500, 5000),
@@ -6250,7 +6250,7 @@ def test_llvm_lto(self):
       sizes[lto] = os.stat('a.out.js').st_size
     print sizes
     assert sizes[1] < sizes[0] # lto reduces size
-    assert sizes[2] > sizes[0] # fake lto is aggressive at increasing code size
+    assert sizes[2] > sizes[1] # fake lto is aggressive at increasing code size compared to normal LTO
     assert sizes[3] not in set([sizes[0], sizes[1], sizes[2]]) # mode 3 is different (deterministic builds means this tests an actual change)
 
   def test_split_memory(self): # make sure multiple split memory chunks get used

tests/test_sanity.py

@@ -186,7 +186,11 @@ def test_llvm(self):
         for y in range(-2, 3):
           f = open(path_from_root('tests', 'fake', 'clang'), 'w')
           f.write('#!/bin/sh\n')
-          f.write('echo "clang version %d.%d" 1>&2\n' % (EXPECTED_LLVM_VERSION[0] + x, EXPECTED_LLVM_VERSION[1] + y))
+          expected_x = EXPECTED_LLVM_VERSION[0] + x
+          expected_y = EXPECTED_LLVM_VERSION[1] + y
+          if expected_x < 0 or expected_y < 0: continue # must be a valid llvm version
+          print EXPECTED_LLVM_VERSION, x, y, expected_x, expected_y
+          f.write('echo "clang version %d.%d" 1>&2\n' % (expected_x, expected_y))
           f.close()
           shutil.copyfile(path_from_root('tests', 'fake', 'clang'), path_from_root('tests', 'fake', 'clang++'))
           os.chmod(path_from_root('tests', 'fake', 'clang'), stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)

tools/shared.py

@@ -320,7 +320,7 @@ def fix_js_engine(old, new):
 
 # Expectations
 
-EXPECTED_LLVM_VERSION = (3, 9)
+EXPECTED_LLVM_VERSION = (4, 0)
 
 actual_clang_version = None