Merge remote-tracking branch 'origin/incoming' into node-pthreads

Author: kripken

.circleci/config.yml

@@ -26,10 +26,11 @@ commands:
             # persistent workspace and to avoid any confusion with the version
             # we are trying to test.
             rm -Rf emscripten
-            echo "V8_ENGINE = '`pwd`/upstream/bin/d8'" >> ~/.emscripten
-            echo "JS_ENGINES = [NODE_JS, V8_ENGINE]" >> ~/.emscripten
-            echo "WASM_ENGINES = []" >> ~/.emscripten
             echo "import os" >> ~/.emscripten
+            echo "V8_ENGINE = os.path.expanduser('~/.jsvu/v8')" >> ~/.emscripten
+            echo "JS_ENGINES = [NODE_JS]" >> ~/.emscripten
+            echo "if os.path.exists(V8_ENGINE): JS_ENGINES.append(V8_ENGINE)" >> ~/.emscripten
+            echo "WASM_ENGINES = []" >> ~/.emscripten
             test -f ~/vms/wasmtime && echo "WASMTIME = os.path.expanduser(os.path.join('~', 'vms', 'wasmtime')) ; WASM_ENGINES.append(WASMTIME)" >> ~/.emscripten || true
             test -f ~/vms/wasmer && echo "WASMER = os.path.expanduser(os.path.join('~', 'vms', 'wasmer')) ; WASM_ENGINES.append(WASMER)" >> ~/.emscripten || true
             cd -
@@ -72,6 +73,7 @@ commands:
             - .emscripten_ports/
             - .emscripten
             - vms
+            - .jsvu
   run-tests:
     description: "Runs emscripten tests"
     parameters:
@@ -392,6 +394,15 @@ jobs:
             wget https://github.com/CraneStation/wasmtime/releases/download/dev/wasmtime-dev-x86_64-linux.tar.xz
             tar -xf wasmtime-dev-x86_64-linux.tar.xz
             cp wasmtime-dev-x86_64-linux/wasmtime ~/vms
+      - run:
+          name: get v8
+          command: |
+            wget https://nodejs.org/dist/v12.13.0/node-v12.13.0-linux-x64.tar.xz
+            tar -xf node-v12.13.0-linux-x64.tar.xz
+            export PATH="`pwd`/node-v12.13.0-linux-x64/bin:${PATH}"
+            npm install jsvu -g
+            export PATH="${HOME}/.jsvu:${PATH}"
+            jsvu --os=default --engines=v8
       - build-upstream
   test-upstream-wasm0:
     executor: bionic

AUTHORS

@@ -431,3 +431,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Cesar Guirao Robles <[email protected]>
 * Mehdi Sabwat <[email protected]>
 * MinganMuon <[email protected]>
+* Osman Turan <[email protected]>

ChangeLog.md

@@ -17,12 +17,17 @@ See docs/process.md for how version tagging works.
 
 Current Trunk
 -------------
+
+v1.39.1: 10/30/2019
+-------------------
  - Only MEMFS is included by default, others (NODEFS, IDBFS, WORKERFS, PROXYFS)
    must be linked in explicitly, using `-lnodefs.js`, `-lidbfs.js`',
    `-lworkerfs.js`, `-lproxyfs.js`. See #9645
 
 v1.39.0: 10/18/2019
 -------------------
+ - The emsdk defaults to the upstream backend (instead of fastcomp) from this
+   release onward (but both backends are still fully supported).
  - Add support for overriding `.emscripten` config variables using environment
    variables.  Any config variable `FOO` can be overridden by `EM_FOO` in the
    environment.

cmake/Modules/Platform/Emscripten.cmake

@@ -2,11 +2,6 @@
 # It teaches CMake about the Emscripten compiler, so that CMake can generate makefiles
 # from CMakeLists.txt that invoke emcc.
 
-# At the moment this required minimum version is not exact (i.e. we do not know of a feature that needs CMake 3.0.0 specifically)
-# It is possible that CMake 3.0.0 is too old and will not actually work. If you do find such a case, please report it at Emscripten
-# bug tracker to revise the minimum requirement. See also https://github.com/emscripten-core/emsdk/issues/108
-cmake_minimum_required(VERSION 3.0.0)
-
 # To use this toolchain file with CMake, invoke CMake with the following command line parameters
 # cmake -DCMAKE_TOOLCHAIN_FILE=<EmscriptenRoot>/cmake/Modules/Platform/Emscripten.cmake
 #       -DCMAKE_BUILD_TYPE=<Debug|RelWithDebInfo|Release|MinSizeRel>

emcc.py

@@ -526,13 +526,15 @@ def run(args):
     # An online HTML version (which may be of a different version of Emscripten)
     #    is up at http://kripken.github.io/emscripten-site/docs/tools_reference/emcc.html
 
-    print('''%s
+    with open(shared.path_from_root('site', 'build', 'text', 'docs', 'tools_reference', 'emcc.txt'), 'r') as f:
+      print(f.read())
 
+    print('''
 ------------------------------------------------------------------
 
 emcc: supported targets: llvm bitcode, javascript, NOT elf
 (autoconf likes to see elf above to enable shared object support)
-''' % (open(shared.path_from_root('site', 'build', 'text', 'docs', 'tools_reference', 'emcc.txt')).read()))
+''')
     return 0
 
   if '--version' in args:
@@ -1814,8 +1816,6 @@ def check_human_readable_list(items):
         exit_with_error('STANDALONE_WASM is only available in the upstream wasm backend path')
       if shared.Settings.USE_PTHREADS:
         exit_with_error('STANDALONE_WASM does not support pthreads yet')
-      if shared.Settings.SIMD:
-        exit_with_error('STANDALONE_WASM does not support simd yet')
       # the wasm must be runnable without the JS, so there cannot be anything that
       # requires JS legalization
       shared.Settings.LEGALIZE_JS_FFI = 0
@@ -1883,6 +1883,9 @@ def is_link_flag(flag):
         return any(flag.startswith(x) for x in ('-l', '-L', '-Wl,'))
 
       compile_args = [a for a in newargs if a and not is_link_flag(a)]
+      if '-fPIC' in compile_args and not shared.Settings.RELOCATABLE:
+        shared.warning('ignoring -fPIC flag when not building with SIDE_MODULE or MAIN_MODULE')
+        compile_args.remove('-fPIC')
 
       # Bitcode args generation code
       def get_clang_command(input_files):
@@ -2996,10 +2999,10 @@ def do_binaryen(target, asm_target, options, memfile, wasm_binary_target,
         options.binaryen_passes += ['--pass-arg=emscripten-sbrk-val@%d' % shared.Settings.DYNAMIC_BASE]
     if DEBUG:
       shared.safe_copy(wasm_binary_target, os.path.join(shared.get_emscripten_temp_dir(), os.path.basename(wasm_binary_target) + '.pre-byn'))
-    cmd = [os.path.join(binaryen_bin, 'wasm-opt'), wasm_binary_target, '-o', wasm_binary_target] + options.binaryen_passes
-    cmd += shared.Building.get_binaryen_feature_flags()
-    if intermediate_debug_info:
-      cmd += ['-g'] # preserve the debug info
+    cmd = shared.Building.get_wasm_opt_command(wasm_binary_target,
+                                               wasm_binary_target,
+                                               options.binaryen_passes,
+                                               debug=intermediate_debug_info)
     if use_source_map(options):
       cmd += ['--input-source-map=' + wasm_source_map_target]
       cmd += ['--output-source-map=' + wasm_source_map_target]
@@ -3057,6 +3060,11 @@ def do_binaryen(target, asm_target, options, memfile, wasm_binary_target,
                                            emitting_js=not target.endswith(WASM_ENDINGS))
     save_intermediate_with_wasm('postclean', wasm_binary_target)
 
+  if shared.Settings.ASYNCIFY_LAZY_LOAD_CODE:
+    if not shared.Settings.ASYNCIFY:
+      exit_with_error('ASYNCIFY_LAZY_LOAD_CODE requires ASYNCIFY')
+    shared.Building.asyncify_lazy_load_code(wasm_binary_target, options, debug=intermediate_debug_info)
+
   def run_closure_compiler(final):
     final = shared.Building.closure_compiler(final, pretty=not optimizer.minify_whitespace,
                                              extra_closure_args=options.closure_args)
@@ -3658,5 +3666,5 @@ def validate_arg_level(level_string, max_level, err_msg, clamp=False):
   try:
     sys.exit(run(sys.argv))
   except KeyboardInterrupt:
-    logger.warning("KeyboardInterrupt")
+    logger.warning('KeyboardInterrupt')
     sys.exit(1)

emranlib

@@ -1,9 +1,24 @@
 #!/usr/bin/env python
+# Copyright 2019 The Emscripten Authors.  All rights reserved.
+# Emscripten is available under two separate licenses, the MIT license and the
+# University of Illinois/NCSA Open Source License.  Both these licenses can be
+# found in the LICENSE file.
 
-'''
-emcc - ranlib helper script
+
+"""emranlib - ranlib helper script
 ===========================
 
 This script acts as a frontend replacement for ranlib. See emcc.
-'''
+"""
+
+
+from __future__ import print_function
+import sys
+from tools import shared
+
+def run():
+  newargs = [shared.LLVM_RANLIB] + sys.argv[1:]
+  return shared.run_process(newargs, stdin=sys.stdin, check=False).returncode
 
+if __name__ == '__main__':
+  sys.exit(run())

emscripten-version.txt

@@ -1 +1 @@
-"1.39.0"
+"1.39.1"

emscripten.py

@@ -2225,10 +2225,11 @@ def emscript_wasm_backend(infile, outfile, memfile, compiler_engine,
 
   asm_consts, asm_const_funcs = create_asm_consts_wasm(forwarded_json, metadata)
   em_js_funcs = create_em_js(forwarded_json, metadata)
+  asm_const_pairs = ['%s: %s' % (key, value) for key, value in asm_consts]
+  asm_const_map = 'var ASM_CONSTS = {\n  ' + ',  \n '.join(asm_const_pairs) + '\n};\n'
   pre = pre.replace(
     '// === Body ===',
-    ('// === Body ===\n\nvar ASM_CONSTS = [' +
-     ',\n '.join(asm_consts) + '];\n' +
+    ('// === Body ===\n\n' + asm_const_map +
      asstr('\n'.join(asm_const_funcs)) +
      '\n'.join(em_js_funcs) + '\n'))
   pre = apply_table(pre)
@@ -2342,7 +2343,7 @@ def debug_copy(src, dst):
 
 
 def create_asm_consts_wasm(forwarded_json, metadata):
-  asm_consts = [0] * len(metadata['asmConsts'])
+  asm_consts = {}
   all_sigs = []
   for k, v in metadata['asmConsts'].items():
     const, sigs, call_types = v
@@ -2417,6 +2418,8 @@ def create_asm_consts_wasm(forwarded_json, metadata):
   var args = readAsmConstArgs(sigPtr, argbuf);
   return ASM_CONSTS[code].apply(null, args);
 }''' % (const_name, preamble))
+  asm_consts = [(key, value) for key, value in asm_consts.items()]
+  asm_consts.sort()
   return asm_consts, asm_const_funcs