Code review changes

Author: aardappel

src/library.js

@@ -3772,16 +3772,13 @@ LibraryManager.library = {
   // mode are created here and imported by the module.
   // Mark with `__import` so these are usable from native code.  This is needed
   // because, by default, only functions can be be imported.
-  __stack_pointer:
-    "new WebAssembly.Global({'value': '{{{ SIZE_TYPE }}}', 'mutable': true}, {{{ to64(STACK_BASE) }}})",
+  __stack_pointer: "new WebAssembly.Global({'value': '{{{ SIZE_TYPE }}}', 'mutable': true}, {{{ to64(STACK_BASE) }}})",
   __stack_pointer__import: true,
   // tell the memory segments where to place themselves
-  __memory_base:
-    "new WebAssembly.Global({'value': '{{{ SIZE_TYPE}}}', 'mutable': false}, {{{ to64(GLOBAL_BASE) }}})",
+  __memory_base: "new WebAssembly.Global({'value': '{{{ SIZE_TYPE}}}', 'mutable': false}, {{{ to64(GLOBAL_BASE) }}})",
   __memory_base__import: true,
   // the wasm backend reserves slot 0 for the NULL function pointer
-  __table_base:
-    "new WebAssembly.Global({'value': '{{{ SIZE_TYPE }}}', 'mutable': false}, {{{ to64(1) }}})",
+  __table_base: "new WebAssembly.Global({'value': '{{{ SIZE_TYPE }}}', 'mutable': false}, {{{ to64(1) }}})",
   __table_base__import: true,
 #if MEMORY64
   __table_base32: 1,

src/library_dylink.js

@@ -43,13 +43,7 @@ var LibraryDylink = {
   $GOTHandler: {
     'get': function(obj, symName) {
       if (!GOT[symName]) {
-        GOT[symName] = new WebAssembly.Global({'value':
-#if MEMORY64
-          'i64',
-#else
-          'i32',
-#endif
-          'mutable': true});
+        GOT[symName] = new WebAssembly.Global({'value': '{{{ SIZE_TYPE }}}', 'mutable': true});
 #if DYLINK_DEBUG
         err("new GOT entry: " + symName);
 #endif

src/library_exceptions.js

@@ -120,17 +120,15 @@ var LibraryExceptions = {
     };
 
     this.set_adjusted_ptr = function(adjustedPtr) {
-      var ptrSize = {{{ `${Runtime.POINTER_SIZE}` }}};
-      {{{ makeSetValue('this.ptr', 'ptrSize', 'adjustedPtr', '*') }}};
+      {{{ makeSetValue('this.ptr', Runtime.POINTER_SIZE, 'adjustedPtr', '*') }}};
     };
 
     this.get_adjusted_ptr_addr = function() {
       return this.ptr + {{{ Runtime.POINTER_SIZE }}};
     }
 
     this.get_adjusted_ptr = function() {
-      var ptrSize = {{{ `${Runtime.POINTER_SIZE}` }}};
-      return {{{ makeGetValue('this.ptr', 'ptrSize', '*') }}};
+      return {{{ makeGetValue('this.ptr', Runtime.POINTER_SIZE, '*') }}};
     };
 
     // Get pointer which is expected to be received by catch clause in C++ code. It may be adjusted
@@ -155,7 +153,7 @@ var LibraryExceptions = {
     };
 
     if (ptr === undefined) {
-      this.ptr = _malloc({{{ `${Runtime.POINTER_SIZE}` * 2 }}});
+      this.ptr = _malloc({{{ Runtime.POINTER_SIZE * 2 }}});
       this.set_adjusted_ptr(0);
     } else {
       this.ptr = ptr;

src/library_pthread.js

@@ -667,11 +667,7 @@ var LibraryPThread = {
     // Deduce which WebGL canvases (HTMLCanvasElements or OffscreenCanvases) should be passed over to the
     // Worker that hosts the spawned pthread.
     // Comma-delimited list of CSS selectors that must identify canvases by IDs: "#canvas1, #canvas2, ..."
-#if MEMORY64
-    var transferredCanvasNames = attr ? {{{ makeGetValue('attr', 40, 'i64') }}} : 0;
-#else
-    var transferredCanvasNames = attr ? {{{ makeGetValue('attr', 40, 'i32') }}} : 0;
-#endif
+    var transferredCanvasNames = attr ? {{{ makeGetValue('attr', 40, `${SIZE_TYPE}`) }}} : 0;
 #if OFFSCREENCANVASES_TO_PTHREAD
     // Proxied canvases string pointer -1 is used as a special token to fetch
     // whatever canvases were passed to build in -s

src/runtime_safe_heap.js

@@ -14,7 +14,7 @@
     @param {number|boolean=} noSafe */
 function setValue(ptr, value, type, noSafe) {
   type = type || 'i8';
-  if (type.charAt(type.length-1) === '*') type = {{{ `'${POINTER_TYPE}'` }}};
+  if (type.charAt(type.length-1) === '*') type = '{{{ POINTER_TYPE }}}';
 #if SAFE_HEAP
   if (noSafe) {
     switch (type) {
@@ -49,7 +49,7 @@ function setValue(ptr, value, type, noSafe) {
     @param {number|boolean=} noSafe */
 function getValue(ptr, type, noSafe) {
   type = type || 'i8';
-  if (type.charAt(type.length-1) === '*') type = {{{ `'${POINTER_TYPE}'` }}};
+  if (type.charAt(type.length-1) === '*') type = '{{{ POINTER_TYPE }}}';
 #if SAFE_HEAP
   if (noSafe) {
     switch (type) {

src/settings.js

@@ -237,6 +237,7 @@ var MEMORY_GROWTH_LINEAR_STEP = -1;
 // the full end-to-end wasm64 mode, and 2 is wasm64 for clang/lld but lowered to
 // wasm32 in Binaryen (such that it can run on wasm32 engines, while internally
 // using i64 pointers).
+// Assumes WASM_BIGINT.
 // [compile+link]
 var MEMORY64 = 0;
 

system/lib/compiler-rt/lib/lsan/lsan_allocator.h

@@ -50,7 +50,7 @@ struct ChunkMetadata {
 };
 
 #if defined(__mips64) || defined(__aarch64__) || defined(__i386__) || \
-    defined(__arm__) || defined(__wasm32__) || defined(__wasm64__)
+    defined(__arm__) || defined(__wasm__)
 static const uptr kRegionSizeLog = 20;
 static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;
 template <typename AddressSpaceView>

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

@@ -427,7 +427,7 @@ struct __sanitizer_file_handle {
 };
 #endif
 
-#if SANITIZER_MAC
+#if SANITIZER_MAC || SANITIZER_EMSCRIPTEN
 struct __sanitizer_msghdr {
   void *msg_name;
   unsigned msg_namelen;
@@ -449,7 +449,7 @@ struct __sanitizer_msghdr {
   void *msg_name;
   unsigned msg_namelen;
   struct __sanitizer_iovec *msg_iov;
-  unsigned msg_iovlen;
+  uptr msg_iovlen;
   void *msg_control;
   unsigned msg_controllen;
   int msg_flags;

system/lib/compiler-rt/lib/ubsan/ubsan_flags.cpp

@@ -74,8 +74,8 @@ void InitializeFlags() {
   // Override from user-specified string.
   parser.ParseString(__ubsan_default_options());
   // Override from environment variable.
-#if SANITIZER_EMSCRIPTEN && !MEMORY64/*FIXME*/
-  char *options = (char*)(long)EM_ASM_DOUBLE({
+#if SANITIZER_EMSCRIPTEN && !defined(__wasm64__)/*FIXME*/
+  char *options = (char*) EM_ASM_INT({
     return withBuiltinMalloc(function () {
       return allocateUTF8(Module['UBSAN_OPTIONS'] || 0);
     });

system/lib/libc/musl/src/network/recvmmsg.c

@@ -5,7 +5,7 @@
 
 int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec *timeout)
 {
-#if LONG_MAX > INT_MAX && 0  // XXX EMSCRIPTEN: __pad fields don't exist.
+#if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__)
 	struct mmsghdr *mh = msgvec;
 	unsigned int i;
 	for (i = vlen; i; i--, mh++)

system/lib/libc/musl/src/network/recvmsg.c

@@ -6,7 +6,7 @@
 ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
 {
 	ssize_t r;
-#if LONG_MAX > INT_MAX && 0  // XXX EMSCRIPTEN: __pad fields don't exist.
+#if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__)
 	struct msghdr h, *orig = msg;
 	if (msg) {
 		h = *msg;
@@ -15,7 +15,7 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
 	}
 #endif
 	r = socketcall_cp(recvmsg, fd, msg, flags, 0, 0, 0);
-#if LONG_MAX > INT_MAX && 0  // XXX EMSCRIPTEN: __pad fields don't exist.
+#if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__)
 	if (orig) *orig = h;
 #endif
 	return r;

system/lib/libc/musl/src/network/sendmsg.c

@@ -7,7 +7,7 @@
 
 ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
 {
-#if LONG_MAX > INT_MAX && 0  // XXX EMSCRIPTEN: __pad fields don't exist.
+#if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__)
 	struct msghdr h;
 	struct cmsghdr chbuf[1024/sizeof(struct cmsghdr)+1], *c;
 	if (msg) {

system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c

@@ -8,10 +8,10 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times
 	if (rw->_rw_wr_owner == (void *)pthread_self()) return EDEADLK;
 #endif
 	int r, t;
-
+    
 	r = pthread_rwlock_trywrlock(rw);
 	if (r != EBUSY) return r;
-
+    
 	int spins = 100;
 	while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
 

system/lib/pthread/library_pthread.c

@@ -675,6 +675,7 @@ double emscripten_run_in_main_runtime_thread_js(int index, int num_args, int64_t
   }
   c->calleeDelete = 1-sync;
   c->functionEnum = EM_PROXIED_JS_FUNCTION;
+  // Index not needed to ever be more than 32-bit.
   c->functionPtr = (void*)(size_t)index;
   assert(num_args+1 <= EM_QUEUED_JS_CALL_MAX_ARGS);
   // The types are only known at runtime in these calls, so we store values that

tests/common.py

@@ -109,6 +109,8 @@ def needs_dylink(func):
 
   @wraps(func)
   def decorated(self, *args, **kwargs):
+    if self.get_setting('MEMORY64'):
+      return self.skipTest('dylink not fully supported with wasm64 yet')
     self.check_dylink()
     return func(self, *args, **kwargs)
 

tests/runner.py

@@ -327,6 +327,8 @@ def configure():
   common.EMTEST_LACKS_NATIVE_CLANG = int(os.getenv('EMTEST_LACKS_NATIVE_CLANG', '0'))
   common.EMTEST_REBASELINE = int(os.getenv('EMTEST_REBASELINE', '0'))
   common.EMTEST_VERBOSE = int(os.getenv('EMTEST_VERBOSE', '0')) or shared.DEBUG
+  global FORCE64
+  FORCE64 = int(os.getenv('EMTEST_FORCE64', '0'))
   if common.EMTEST_VERBOSE:
     logging.root.setLevel(logging.DEBUG)
 

tests/test_benchmark.py

@@ -51,7 +51,7 @@
 
 LLVM_FEATURE_FLAGS = ['-mnontrapping-fptoint']
 
-FORCE64 = int(os.getenv('EMTEST_FORCE64', '0'))
+FORCE64 = 0
 
 
 class Benchmarker():

tests/test_core.py

@@ -3557,10 +3557,6 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
                    main_module=2,
                    so_name='liblib.so',
                    need_reverse=True, **kwargs):
-    if self.get_setting('MEMORY64'):
-      # FIXME: this is actually mostly working, but disabled for now.
-      self.skipTest('dylink not fully supported with wasm64 yet')
-
     self.maybe_closure()
     # Same as dylink_test but takes source code as filenames on disc.
     old_args = self.emcc_args.copy()
@@ -8706,7 +8702,7 @@ def test_em_async_js(self):
 
 
 # Generate tests for everything
-def make_run(name, emcc_args, settings=None, env=None, wasm64=False):
+def make_run(name, emcc_args, settings=None, env=None, node_args=None):
   if env is None:
     env = {}
   if settings is None:
@@ -8725,7 +8721,7 @@ def tearDown(self):
       for k, v in self.env.items():
         del os.environ[k]
 
-    if wasm64:
+    if node_args:
       self.node_args = TT.original
 
   TT.tearDown = tearDown
@@ -8743,9 +8739,9 @@ def setUp(self):
 
     self.emcc_args += emcc_args
 
-    if wasm64:
+    if node_args:
       TT.original = self.node_args
-      self.node_args.append('--experimental-wasm-bigint')
+      self.node_args.append(node_args)
 
   TT.setUp = setUp
 
@@ -8761,8 +8757,8 @@ def setUp(self):
 wasm3 = make_run('wasm3', emcc_args=['-O3'])
 wasms = make_run('wasms', emcc_args=['-Os'])
 wasmz = make_run('wasmz', emcc_args=['-Oz'])
-# wasm64 = make_run('wasm64', emcc_args=['-O0', '-g3', '-s', 'MEMORY64=2'],
-#                   settings=None, env=None, wasm64=True)
+# wasm64 = make_run('wasm64', emcc_args=['-O0', '-g3'],
+#                   settings={'MEMORY64':2}, env=None, node_args='--experimental-wasm-bigint')
 
 wasmlto0 = make_run('wasmlto0', emcc_args=['-flto', '-O0'])
 wasmlto1 = make_run('wasmlto1', emcc_args=['-flto', '-O1'])

tools/gen_struct_info.py

@@ -266,7 +266,13 @@ def inspect_headers(headers, cflags):
                                '-Wno-format',
                                '-nostdlib',
                                compiler_rt,
-                               '-s', 'MEMORY64=' + str(settings.MEMORY64),
+                               # FIXME: this setting here won't work, since this is only
+                               # ran once on first use. If there are differences here then
+                               #  we would need a second set of json file and have them stored
+                               # separately in the cache.
+                               # Whereever generated_struct_info.json is generated, there now
+                               # needs to be a generated_struct_info64.json for MEMORY64 mode.
+                               #'-s', 'MEMORY64=' + str(settings.MEMORY64),
                                '-s', 'BOOTSTRAPPING_STRUCT_INFO=1',
                                '-s', 'LLD_REPORT_UNDEFINED=1',
                                '-s', 'STRICT',