<div dir="ltr"><div dir="ltr"><div>The fix is probably this, though I haven't tested it yet:<br></div><div><br></div><div>diff --git a/tests/test_core.py b/tests/test_core.py<br>index a74efd137..34025ee5a 100644<br>--- a/tests/test_core.py<br>+++ b/tests/test_core.py<br>@@ -1124,10 +1125,12 @@ int main(int argc, char **argv)<br>     self.set_setting('DISABLE_EXCEPTION_CATCHING', 2)<br>     # Wasm does not add an underscore to function names. For wasm, the<br>     # mismatches are fixed in fixImports() function in JS glue code.<br>+    # Also, the wasm backend translates "main(void)" to a<br>+    # "main(int, char *[])" wrapper around "__original_main(void)".<br>     if not self.is_wasm_backend():<br>       self.set_setting('EXCEPTION_CATCHING_WHITELIST', ["_main"])<br>     else:<br>-      self.set_setting('EXCEPTION_CATCHING_WHITELIST', ["main"])<br>+      self.set_setting('EXCEPTION_CATCHING_WHITELIST', ["main", "__original_main"])<br>     # otherwise it is inlined and not identified<br>     self.set_setting('INLINING_LIMIT', 1)<br> <br></div><div>If anyone has a chance to test this before me, feel free to apply this. Otherwise I'll submit a PR when I get a chance.<br></div><div><br></div><div>Dan<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 29, 2019 at 10:23 AM Alon Zakai via Phabricator <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">kripken added a comment.<br>
<br>
This broke binaryen2.test_exceptions_white_list_2<br>
<br>
e.g. <a href="https://logs.chromium.org/logs/wasm/buildbucket/cr-buildbucket.appspot.com/8922985927078952624/+/steps/Execute_emscripten_testsuite__emwasm_/0/stdout" rel="noreferrer" target="_blank">https://logs.chromium.org/logs/wasm/buildbucket/cr-buildbucket.appspot.com/8922985927078952624/+/steps/Execute_emscripten_testsuite__emwasm_/0/stdout</a><br>
<br>
<br>
Repository:<br>
  rL LLVM<br>
<br>
CHANGES SINCE LAST ACTION<br>
  <a href="https://reviews.llvm.org/D57323/new/" rel="noreferrer" target="_blank">https://reviews.llvm.org/D57323/new/</a><br>
<br>
<a href="https://reviews.llvm.org/D57323" rel="noreferrer" target="_blank">https://reviews.llvm.org/D57323</a><br>
<br>
<br>
<br>
</blockquote></div></div></div>