Merge branch 'main' into bind_to

kripken · web-flow · commit 635fdb1e9046 · 2024-10-25T08:59:41.000-07:00
diff --git a/emcc.py b/emcc.py
@@ -384,6 +384,15 @@ def get_clang_flags(user_args):
     if '-mbulk-memory' not in user_args:
       flags.append('-mbulk-memory')
 
+  # In emscripten we currently disable bulk memory by default.
+  # This should be removed/updated when we als update the default browser targets.
+  if '-mbulk-memory' not in user_args and '-mno-bulk-memory' not in user_args:
+    # Bulk memory may be enabled via threads or directly via -s.
+    if not settings.BULK_MEMORY:
+      flags.append('-mno-bulk-memory')
+  if '-mnontrapping-fptoint' not in user_args and '-mno-nontrapping-fptoint' not in user_args:
+    flags.append('-mno-nontrapping-fptoint')
+
   if settings.RELOCATABLE and '-fPIC' not in user_args:
     flags.append('-fPIC')
 
diff --git a/src/embind/embind_gen.js b/src/embind/embind_gen.js
@@ -172,6 +172,8 @@ var LibraryEmbind = {
       out.push(`export interface ${this.name}`);
       if (this.base) {
         out.push(` extends ${this.base.name}`);
+      } else {
+        out.push(' extends ClassHandle');
       }
       out.push(' {\n');
       for (const property of this.properties) {
@@ -186,7 +188,6 @@ var LibraryEmbind = {
         method.printFunction(nameMap, out);
         out.push(';\n');
       }
-      out.push('  delete(): void;\n');
       out.push('}\n\n');
     }
 
@@ -402,6 +403,24 @@ var LibraryEmbind = {
 
     print() {
       const out = [];
+      let hadClass = false;
+      for (const def of this.definitions) {
+        if (def instanceof ClassDefinition) {
+          hadClass = true;
+          break;
+        }
+      }
+      if (hadClass) {
+        out.push(
+          'export interface ClassHandle {\n',
+          '  isAliasOf(other: ClassHandle): boolean;\n',
+          '  delete(): void;\n',
+          '  deleteLater(): this;\n',
+          '  isDeleted(): boolean;\n',
+          '  clone(): this;\n',
+          '}\n',
+        );
+      }
       for (const def of this.definitions) {
         if (!def.print) {
           continue;
diff --git a/src/library_pthread.js b/src/library_pthread.js
@@ -168,7 +168,7 @@ var LibraryPThread = {
       }
       PThread.unusedWorkers = [];
       PThread.runningWorkers = [];
-      PThread.pthreads = [];
+      PThread.pthreads = {};
     },
     returnWorkerToPool: (worker) => {
       // We don't want to run main thread queued calls here, since we are doing
diff --git a/src/library_webgpu.js b/src/library_webgpu.js
@@ -822,16 +822,20 @@ var LibraryWebGPU = {
   // wgpuDevice
 
   wgpuDeviceEnumerateFeatures: (deviceId, featuresOutPtr) => {
+    var offset = 0;
+    var numFeatures = 0;
     var device = WebGPU.mgrDevice.get(deviceId);
-    if (featuresOutPtr !== 0) {
-      var offset = 0;
-      device.features.forEach(feature => {
-        var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
-        {{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
-        offset += 4;
-      });
-    }
-    return device.features.size;
+    device.features.forEach(feature => {
+      var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
+      if (featureEnumValue !== undefined) {
+        if (featuresOutPtr !== 0) {
+          {{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
+          offset += 4;
+        }
+        numFeatures++;
+      }
+    });
+    return numFeatures;
   },
 
   wgpuDeviceDestroy: (deviceId) => WebGPU.mgrDevice.get(deviceId).destroy(),
@@ -2568,16 +2572,20 @@ var LibraryWebGPU = {
   // WGPUAdapter
 
   wgpuAdapterEnumerateFeatures: (adapterId, featuresOutPtr) => {
+    var offset = 0;
+    var numFeatures = 0;
     var adapter = WebGPU.mgrAdapter.get(adapterId);
-    if (featuresOutPtr !== 0) {
-      var offset = 0;
-      adapter.features.forEach(feature => {
-        var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
-        {{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
-        offset += 4;
-      });
-    }
-    return adapter.features.size;
+    adapter.features.forEach(feature => {
+      var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
+      if (featureEnumValue !== undefined) {
+        if (featuresOutPtr !== 0) {
+          {{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
+          offset += 4;
+        }
+        numFeatures++;
+      }
+    });
+    return numFeatures;
   },
 
   wgpuAdapterGetInfo__deps: ['$stringToNewUTF8'],
diff --git a/src/memoryprofiler.js b/src/memoryprofiler.js
@@ -503,7 +503,7 @@ var emscriptenMemoryProfiler = {
     html += '<br />STACK memory area used now (should be zero): ' + self.formatBytes(stackBase - stackCurrent) + '.' + colorBar('#FFFF00') + ' STACK watermark highest seen usage (approximate lower-bound!): ' + self.formatBytes(stackBase - self.stackTopWatermark);
 
     var heap_base = Module['___heap_base'];
-    var heap_end = _sbrk();
+    var heap_end = _sbrk({{{ to64('0') }}});
     html += "<br />DYNAMIC memory area size: " + self.formatBytes(heap_end - heap_base);
     html += ". start: " + toHex(heap_base, width);
     html += ". end: " + toHex(heap_end, width) + ".";
@@ -612,8 +612,8 @@ var emscriptenMemoryProfiler = {
             calls.sort((a,b) => b[sortIdx] - a[sortIdx]);
           }
           html += '<h4>Allocation sites with more than ' + self.formatBytes(self.trackedCallstackMinSizeBytes) + ' of accumulated allocations, or more than ' + self.trackedCallstackMinAllocCount + ' simultaneously outstanding allocations:</h4>'
-          for (var i in calls) {
-            html += "<b>" + self.formatBytes(calls[i][1]) + '/' + calls[i][0] + " allocs</b>: " + calls[i][2] + "<br />";
+          for (var call of calls) {
+            html += "<b>" + self.formatBytes(call[1]) + '/' + call[0] + " allocs</b>: " + call[2] + "<br />";
           }
         }
       }
diff --git a/src/runtime_init_memory.js b/src/runtime_init_memory.js
@@ -46,6 +46,10 @@ if (!ENVIRONMENT_IS_PTHREAD) {
       'shared': true,
 #endif
 #if MEMORY64 == 1
+      'address': 'i64',
+      // TODO(sbc): remove this alias for `address` once both firefox and
+      // chrome roll out the spec change.
+      // See https://github.com/WebAssembly/memory64/pull/92
       'index': 'i64',
 #endif
     });
diff --git a/src/runtime_shared.js b/src/runtime_shared.js
@@ -55,7 +55,7 @@ var toIndexType = (function() {
   var bigintMemoryBounds = 1;
   try {
     /** @suppress {checkTypes} */
-    new WebAssembly.Memory({'initial': 1n, 'index': 'i64'});
+    new WebAssembly.Memory({'initial': 1n, 'index': 'i64', 'address': 'i64'});
   } catch (e) {
     bigintMemoryBounds = 0;
   }
diff --git a/src/threadprofiler.js b/src/threadprofiler.js
@@ -15,21 +15,23 @@ var emscriptenThreadProfiler = {
 
   // Installs startup hook and periodic UI update timer.
   initialize() {
-    this.threadProfilerDiv = document.getElementById('threadprofiler');
-    if (!this.threadProfilerDiv) {
+    var self = emscriptenThreadProfiler;
+    self.threadProfilerDiv = document.getElementById('threadprofiler');
+    if (!self.threadProfilerDiv) {
       var div = document.createElement("div");
       div.innerHTML = "<div id='threadprofiler' style='margin: 20px; border: solid 1px black;'></div>";
       document.body.appendChild(div);
-      this.threadProfilerDiv = document.getElementById('threadprofiler');
+      self.threadProfilerDiv = document.getElementById('threadprofiler');
     }
-    var i = setInterval(function() { emscriptenThreadProfiler.updateUi() }, this.uiUpdateIntervalMsecs);
+    var i = setInterval(() => self.updateUi(), self.uiUpdateIntervalMsecs);
     addOnExit(() => clearInterval(i));
   },
 
   initializeNode() {
     addOnInit(() => {
-      emscriptenThreadProfiler.dumpState();
-      var i = setInterval(function() { emscriptenThreadProfiler.dumpState() }, this.uiUpdateIntervalMsecs);
+      var self = emscriptenThreadProfiler;
+      self.dumpState();
+      var i = setInterval(() => self.dumpState(), self.uiUpdateIntervalMsecs);
       addOnExit(() => clearInterval(i));
     });
   },
@@ -38,11 +40,10 @@ var emscriptenThreadProfiler = {
     var mainThread = _emscripten_main_runtime_thread_id();
 
     var threads = [mainThread];
-    for (var i in PThread.pthreads) {
-      threads.push(PThread.pthreads[i].pthread_ptr);
+    for (var thread of Object.values(PThread.pthreads)) {
+      threads.push(thread.pthread_ptr);
     }
-    for (var i = 0; i < threads.length; ++i) {
-      var threadPtr = threads[i];
+    for (var threadPtr of threads) {
       var threadName = PThread.getThreadName(threadPtr);
       if (threadName) {
         threadName = `"${threadName}" (${ptrToString(threadPtr)})`;
@@ -60,16 +61,18 @@ var emscriptenThreadProfiler = {
       // initialized yet, ignore updating.
       return;
     }
+    if (!runtimeInitialized) {
+      return;
+    }
     var str = '';
     var mainThread = _emscripten_main_runtime_thread_id();
 
     var threads = [mainThread];
-    for (var i in PThread.pthreads) {
-      threads.push(PThread.pthreads[i].pthread_ptr);
+    for (var thread of Object.values(PThread.pthreads)) {
+      threads.push(thread.pthread_ptr);
     }
 
-    for (var i = 0; i < threads.length; ++i) {
-      var threadPtr = threads[i];
+    for (var threadPtr of threads) {
       var profilerBlock = Atomics.load({{{ getHeapForType('*') }}}, {{{ getHeapOffset('threadPtr + ' + C_STRUCTS.pthread.profilerBlock, '*') }}});
 #if MEMORY64
       profilerBlock = Number(profilerBlock);
@@ -100,7 +103,7 @@ var emscriptenThreadProfiler = {
       if (recent.length > 0) str += `Recent activity: ${recent}`;
       str += '<br />';
     }
-    this.threadProfilerDiv.innerHTML = str;
+    emscriptenThreadProfiler.threadProfilerDiv.innerHTML = str;
   }
 };
 
diff --git a/system/lib/libc/emscripten_memcpy.c b/system/lib/libc/emscripten_memcpy.c
@@ -22,7 +22,7 @@ static void *__memcpy(void *dest, const void *src, size_t n) {
 #elif defined(__wasm_bulk_memory__)
 
 static void *__memcpy(void *restrict dest, const void *restrict src, size_t n) {
-  return _emscripten_memcpy_bulkmem(dest, src, n);
+  return n ? _emscripten_memcpy_bulkmem(dest, src, n) : dest;
 }
 
 #else
diff --git a/test/atomic/test_wait_async.c b/test/atomic/test_wait_async.c
@@ -73,12 +73,12 @@ void asyncWaitFinishedShouldBeOk(int32_t* ptr,
   assert(numCalled == 2);
   assert(waitResult == ATOMICS_WAIT_OK);
   emscripten_out("test finished");
-#ifdef REPORT_RESULT
-  REPORT_RESULT(0);
-#endif
-#if !defined(__EMSCRIPTEN_WASM_WORKERS__)
+#ifdef __EMSCRIPTEN_WASM_WORKERS__
+  emscripten_terminate_all_wasm_workers();
+#else
   pthread_join(t, NULL);
 #endif
+  emscripten_force_exit(0);
 }
 
 int main() {
diff --git a/test/code_size/hello_wasm_worker_wasm.json b/test/code_size/hello_wasm_worker_wasm.json
@@ -5,8 +5,8 @@
   "a.js.gz": 455,
   "a.ww.js": 115,
   "a.ww.js.gz": 127,
-  "a.wasm": 1879,
-  "a.wasm.gz": 1066,
-  "total": 3277,
-  "total_gz": 2032
+  "a.wasm": 1881,
+  "a.wasm.gz": 1065,
+  "total": 3279,
+  "total_gz": 2031
 }
diff --git a/test/core/test_memcpy_zero_bytes.c b/test/core/test_memcpy_zero_bytes.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include <string.h>
+
+#include <emscripten/heap.h>
+
+int main() {
+  char buf[1024];
+  void* oob_address = (void*)(emscripten_get_heap_size() + 10);
+  memcpy(buf, oob_address, 0);
+  printf("done\n");
+}
diff --git a/test/core/test_memcpy_zero_bytes.out b/test/core/test_memcpy_zero_bytes.out
@@ -0,0 +1 @@
+done
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129383
+129307
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128829
+128753
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171510
+171434
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142601
+142525
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
@@ -1 +1 @@
-145238
+145162
diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-122555
+122499
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-233025
+232945
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-132187
+132111
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169562
+169486
diff --git a/test/other/codesize/test_codesize_hello_dylink.size b/test/other/codesize/test_codesize_hello_dylink.size
@@ -1 +1 @@
-9789
+9784
diff --git a/test/other/codesize/test_codesize_minimal_64.gzsize b/test/other/codesize/test_codesize_minimal_64.gzsize
@@ -1 +1 @@
-1579
+1585
diff --git a/test/other/codesize/test_codesize_minimal_64.jssize b/test/other/codesize/test_codesize_minimal_64.jssize
@@ -1 +1 @@
-3257
+3271
diff --git a/test/other/embind_tsgen.d.ts b/test/other/embind_tsgen.d.ts
diff --git a/test/other/embind_tsgen_ignore_1.d.ts b/test/other/embind_tsgen_ignore_1.d.ts
diff --git a/test/other/embind_tsgen_ignore_2.d.ts b/test/other/embind_tsgen_ignore_2.d.ts
diff --git a/test/other/embind_tsgen_ignore_3.d.ts b/test/other/embind_tsgen_ignore_3.d.ts
diff --git a/test/test_browser.py b/test/test_browser.py
diff --git a/test/test_core.py b/test/test_core.py
diff --git a/test/test_other.py b/test/test_other.py
diff --git a/test/wasm_worker/malloc_wasm_worker.c b/test/wasm_worker/malloc_wasm_worker.c
diff --git a/tools/system_libs.py b/tools/system_libs.py
diff --git a/tools/webassembly.py b/tools/webassembly.py

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ var LibraryPThread = {`
`168`	`168`	`}`
`169`	`169`	`PThread.unusedWorkers = [];`
`170`	`170`	`PThread.runningWorkers = [];`
`171`		`- PThread.pthreads = [];`
	`171`	`+ PThread.pthreads = {};`
`172`	`172`	`},`
`173`	`173`	`returnWorkerToPool: (worker) => {`
`174`	`174`	`// We don't want to run main thread queued calls here, since we are doing`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ var emscriptenMemoryProfiler = {`
`503`	`503`	`html += '<br />STACK memory area used now (should be zero): ' + self.formatBytes(stackBase - stackCurrent) + '.' + colorBar('#FFFF00') + ' STACK watermark highest seen usage (approximate lower-bound!): ' + self.formatBytes(stackBase - self.stackTopWatermark);`
`504`	`504`
`505`	`505`	`var heap_base = Module['___heap_base'];`
`506`		`- var heap_end = _sbrk();`
	`506`	`+ var heap_end = _sbrk({{{ to64('0') }}});`
`507`	`507`	`html += "<br />DYNAMIC memory area size: " + self.formatBytes(heap_end - heap_base);`
`508`	`508`	`html += ". start: " + toHex(heap_base, width);`
`509`	`509`	`html += ". end: " + toHex(heap_end, width) + ".";`
`@@ -612,8 +612,8 @@ var emscriptenMemoryProfiler = {`
`612`	`612`	`calls.sort((a,b) => b[sortIdx] - a[sortIdx]);`
`613`	`613`	`}`
`614`	`614`	`html += '<h4>Allocation sites with more than ' + self.formatBytes(self.trackedCallstackMinSizeBytes) + ' of accumulated allocations, or more than ' + self.trackedCallstackMinAllocCount + ' simultaneously outstanding allocations:</h4>'`
`615`		`- for (var i in calls) {`
`616`		`- html += "<b>" + self.formatBytes(calls[i][1]) + '/' + calls[i][0] + " allocs</b>: " + calls[i][2] + "<br />";`
	`615`	`+ for (var call of calls) {`
	`616`	`+ html += "<b>" + self.formatBytes(call[1]) + '/' + call[0] + " allocs</b>: " + call[2] + "<br />";`
`617`	`617`	`}`
`618`	`618`	`}`
`619`	`619`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ var toIndexType = (function() {`
`55`	`55`	`var bigintMemoryBounds = 1;`
`56`	`56`	`try {`
`57`	`57`	`/** @suppress {checkTypes} */`
`58`		`- new WebAssembly.Memory({'initial': 1n, 'index': 'i64'});`
	`58`	`+ new WebAssembly.Memory({'initial': 1n, 'index': 'i64', 'address': 'i64'});`
`59`	`59`	`} catch (e) {`
`60`	`60`	`bigintMemoryBounds = 0;`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ static void __memcpy(void dest, const void *src, size_t n) {`
`22`	`22`	`#elif defined(__wasm_bulk_memory__)`
`23`	`23`
`24`	`24`	`static void __memcpy(void restrict dest, const void *restrict src, size_t n) {`
`25`		`- return _emscripten_memcpy_bulkmem(dest, src, n);`
	`25`	`+ return n ? _emscripten_memcpy_bulkmem(dest, src, n) : dest;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`#else`