Merge branch 'main' into cw-audio-memory64

Author: cwoffenden

site/source/docs/porting/connecting_cpp_and_javascript/embind.rst

@@ -1071,7 +1071,7 @@ Out of the box, *embind* provides converters for many standard C++ types:
 \*\*Requires BigInt support to be enabled with the `-sWASM_BIGINT` flag.
 
 For convenience, *embind* provides factory functions to register
-``std::vector<T>`` (:cpp:func:`register_vector`), ``std::map<K, V>``
+``std::vector<T, class Allocator=std::allocator<T>>`` (:cpp:func:`register_vector`), ``std::map<K, V, class Compare=std::less<K>, class Allocator=std::allocator<std::pair<const K, V>>>``
 (:cpp:func:`register_map`), and ``std::optional<T>`` (:cpp:func:`register_optional`) types:
 
 .. code:: cpp

src/jsifier.mjs

@@ -9,7 +9,6 @@
 
 import assert from 'node:assert';
 import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import {
   ATEXITS,
   ATINITS,
@@ -146,23 +145,27 @@ function shouldPreprocess(fileName) {
   return content.startsWith('#preprocess\n') || content.startsWith('#preprocess\r\n');
 }
 
-function getIncludeFile(fileName, alwaysPreprocess) {
-  let result = `// include: ${fileName}\n`;
-  const absFile = path.isAbsolute(fileName) ? fileName : localFile(fileName);
-  const doPreprocess = alwaysPreprocess || shouldPreprocess(absFile);
+function getIncludeFile(fileName, alwaysPreprocess, shortName) {
+  shortName ??= fileName;
+  let result = `// include: ${shortName}\n`;
+  const doPreprocess = alwaysPreprocess || shouldPreprocess(fileName);
   if (doPreprocess) {
-    result += processMacros(preprocess(absFile), fileName);
+    result += processMacros(preprocess(fileName), fileName);
   } else {
-    result += readFile(absFile);
+    result += readFile(fileName);
   }
-  result += `// end include: ${fileName}\n`;
+  result += `// end include: ${shortName}\n`;
   return result;
 }
 
+function getSystemIncludeFile(fileName) {
+  return getIncludeFile(localFile(fileName), /*alwaysPreprocess=*/ true, /*shortName=*/ fileName);
+}
+
 function preJS() {
   let result = '';
   for (const fileName of PRE_JS_FILES) {
-    result += getIncludeFile(fileName, /*alwaysPreprocess=*/ false);
+    result += getIncludeFile(fileName);
   }
   return result;
 }
@@ -714,8 +717,12 @@ function(${args}) {
     libraryItems.push(JS);
   }
 
-  function includeFile(fileName, alwaysPreprocess = true) {
-    writeOutput(getIncludeFile(fileName, alwaysPreprocess));
+  function includeSystemFile(fileName) {
+    writeOutput(getSystemIncludeFile(fileName));
+  }
+
+  function includeFile(fileName) {
+    writeOutput(getIncludeFile(fileName));
   }
 
   function finalCombiner() {
@@ -741,10 +748,10 @@ function(${args}) {
     postSets.push(...orderedPostSets);
 
     const shellFile = MINIMAL_RUNTIME ? 'shell_minimal.js' : 'shell.js';
-    includeFile(shellFile);
+    includeSystemFile(shellFile);
 
     const preFile = MINIMAL_RUNTIME ? 'preamble_minimal.js' : 'preamble.js';
-    includeFile(preFile);
+    includeSystemFile(preFile);
 
     for (const item of libraryItems.concat(postSets)) {
       writeOutput(indentify(item || '', 2));
@@ -769,14 +776,14 @@ var proxiedFunctionTable = [
     writeOutput('// EMSCRIPTEN_END_FUNCS\n');
 
     const postFile = MINIMAL_RUNTIME ? 'postamble_minimal.js' : 'postamble.js';
-    includeFile(postFile);
+    includeSystemFile(postFile);
 
     for (const fileName of POST_JS_FILES) {
-      includeFile(fileName, /*alwaysPreprocess=*/ false);
+      includeFile(fileName);
     }
 
     if (MODULARIZE) {
-      includeFile('postamble_modularize.js');
+      includeSystemFile('postamble_modularize.js');
     }
 
     if (errorOccured()) {

src/lib/libglfw.js

@@ -836,7 +836,7 @@ var LibraryGLFW = {
       event.preventDefault();
 
 #if FILESYSTEM
-      var filenames = _malloc(event.dataTransfer.files.length*4);
+      var filenames = _malloc(event.dataTransfer.files.length * {{{ POINTER_SIZE }}});
       var filenamesArray = [];
       var count = event.dataTransfer.files.length;
 
@@ -858,7 +858,7 @@ var LibraryGLFW = {
           var data = e.target.result;
           FS.writeFile(path, new Uint8Array(data));
           if (++written === count) {
-            {{{ makeDynCall('vpii', 'GLFW.active.dropFunc') }}}(GLFW.active.id, count, filenames);
+            {{{ makeDynCall('vpip', 'GLFW.active.dropFunc') }}}(GLFW.active.id, count, filenames);
 
             for (var i = 0; i < filenamesArray.length; ++i) {
               _free(filenamesArray[i]);
@@ -870,7 +870,7 @@ var LibraryGLFW = {
 
         var filename = stringToNewUTF8(path);
         filenamesArray.push(filename);
-        {{{ makeSetValue('filenames + i*4', '0', 'filename', POINTER_TYPE) }}};
+        {{{ makeSetValue('filenames', `i*${POINTER_SIZE}` , 'filename', POINTER_TYPE) }}};
       }
 
       for (var i = 0; i < count; ++i) {

system/include/emscripten/bind.h

@@ -2073,9 +2073,9 @@ struct VectorAccess {
 
 } // end namespace internal
 
-template<typename T>
-class_<std::vector<T>> register_vector(const char* name) {
-    typedef std::vector<T> VecType;
+template<typename T, class Allocator=std::allocator<T>>
+class_<std::vector<T, Allocator>> register_vector(const char* name) {
+    typedef std::vector<T, Allocator> VecType;
 #if __cplusplus >= 201703L
     register_optional<T>();
 #endif
@@ -2151,9 +2151,10 @@ struct MapAccess {
 
 } // end namespace internal
 
-template<typename K, typename V>
-class_<std::map<K, V>> register_map(const char* name) {
-    typedef std::map<K,V> MapType;
+template<typename K, typename V, class Compare = std::less<K>, 
+    class Allocator = std::allocator<std::pair<const K, V>>>
+class_<std::map<K, V, Compare, Allocator>> register_map(const char* name) {
+    typedef std::map<K,V, Compare, Allocator> MapType;
 #if __cplusplus >= 201703L
     register_optional<V>();
 #endif

test/embind/embind.test.js

@@ -1185,6 +1185,26 @@ module({
        });
     });
 
+    BaseFixture.extend("map_with_greater_comparator", function() {
+        test("std::map with std::greater comparator", function() {
+            var map = cm.embind_test_get_int_string_greater_map();
+            assert.equal(2, map.size());
+            assert.equal("one", map.get(1));
+            assert.equal("two", map.get(2));
+            map.delete();
+        });
+
+        test("std::map with std::greater comparator keys are sorted in reverse", function() {
+            var map = cm.embind_test_get_int_string_greater_map();
+            var keys = map.keys();
+            assert.equal(2, keys.size());
+            assert.equal(2, keys.get(0));
+            assert.equal(1, keys.get(1));
+            keys.delete();
+            map.delete();
+        });
+    });
+
     BaseFixture.extend("optional", function() {
         if (!("embind_test_return_optional_int" in cm)) {
             return;

test/embind/embind_test.cpp

@@ -885,6 +885,15 @@ std::map<std::string, int> embind_test_get_string_int_map() {
   return m;
 };
 
+std::map<int, std::string, std::greater<int>> embind_test_get_int_string_greater_map() {
+    std::map<int, std::string, std::greater<int>> m;
+
+    m[1] = "one";
+    m[2] = "two";
+
+    return m;
+}
+
 struct Vector {
   Vector() = delete;
 
@@ -2373,6 +2382,9 @@ EMSCRIPTEN_BINDINGS(tests) {
 
   register_map<std::string, int>("StringIntMap");
   function("embind_test_get_string_int_map", embind_test_get_string_int_map);
+    
+  register_map<int, std::string, std::greater<int>>("IntStringMapGreater");
+  function("embind_test_get_int_string_greater_map", embind_test_get_int_string_greater_map);
 
   function("embind_test_getglobal", &embind_test_getglobal);
 

test/other/codesize/test_codesize_cxx_lto.size

@@ -1 +1 @@
-122093
+121986

test/other/codesize/test_codesize_cxx_mangle.size

@@ -1 +1 @@
-232619
+232586

test/runner.py

@@ -329,8 +329,8 @@ def run_tests(options, suites):
   resultMessages = []
   num_failures = 0
 
-  print('Test suites:')
-  print([s[0] for s in suites])
+  if len(suites) > 1:
+    print('Test suites:', [s[0] for s in suites])
   # Run the discovered tests
 
   # We currently don't support xmlrunner on macOS M1 runner since

tools/link.py

@@ -1826,8 +1826,8 @@ def get_full_import_name(name):
   if settings.PTHREADS:
     settings.REQUIRED_EXPORTS.append('_emscripten_tls_init')
 
-  settings.PRE_JS_FILES = [os.path.abspath(f) for f in options.pre_js]
-  settings.POST_JS_FILES = [os.path.abspath(f) for f in options.post_js]
+  settings.PRE_JS_FILES = options.pre_js
+  settings.POST_JS_FILES = options.post_js
 
   settings.MINIFY_WHITESPACE = settings.OPT_LEVEL >= 2 and settings.DEBUG_LEVEL == 0 and not options.no_minify