From 2a096a37caf588741948184cb67d6a55289d1a21 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 1 Nov 2023 17:14:06 -0700
Subject: [PATCH] [embind] Add `#if ASSERTIONS` guard around assert calls

Supersedes #20504
---
 src/embind/embind_shared.js | 4 ++++
 test/test_other.py          | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/embind/embind_shared.js b/src/embind/embind_shared.js
index e25681b84681c..79408d2526106 100644
--- a/src/embind/embind_shared.js
+++ b/src/embind/embind_shared.js
@@ -129,7 +129,9 @@ var LibraryEmbindShared = {
     signature = signature.trim();
     const argsIndex = signature.indexOf("(");
     if (argsIndex !== -1) {
+#if ASSERTIONS
       assert(signature[signature.length - 1] == ")", "Parentheses for argument names should match.");
+#endif
       return signature.substr(0, argsIndex);
     } else {
       return signature;
@@ -140,7 +142,9 @@ var LibraryEmbindShared = {
     signature = signature.trim();
     const argsIndex = signature.indexOf("(") + 1;
     if (argsIndex !== 0) {
+#if ASSERTIONS
       assert(signature[signature.length - 1] == ")", "Parentheses for argument names should match.");
+#endif
       return signature.substr(argsIndex, signature.length - argsIndex - 1).replaceAll(" ", "").split(",").filter(n => n.length);
     } else {
       return [];
diff --git a/test/test_other.py b/test/test_other.py
index 634e222848b5d..0016b7e1afe35 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -2900,9 +2900,11 @@ def test_embind_closure_no_dynamic_execution(self):
         emscripten::function("bar", &bar);
       }
     ''')
-    self.emcc_args.remove('-Wclosure')
+    self.set_setting('INCOMING_MODULE_JS_API', 'onRuntimeInitialized')
+    self.set_setting('STRICT')
+    self.set_setting('NO_DYNAMIC_EXECUTION')
     self.do_runf('main.cpp', '10\nok\n',
-                 emcc_args=['-lembind', '-O2', '--closure', '1', '-sNO_DYNAMIC_EXECUTION', '--post-js', 'post.js'])
+                 emcc_args=['--no-entry', '-lembind', '-O2', '--closure=1', '--minify=0', '--post-js=post.js'])
 
   @is_slow_test
   @parameterized({