[EH/SjLj] Support Wasm EH + Wasm SjLj

emcc.py

@@ -1413,8 +1413,6 @@ def default_setting(name, new_default):
       exit_with_error('SUPPORT_LONGJMP=wasm cannot be used with DISABLE_EXCEPTION_CATCHING=0')
     if not settings.DISABLE_EXCEPTION_THROWING:
       exit_with_error('SUPPORT_LONGJMP=wasm cannot be used with DISABLE_EXCEPTION_THROWING=0')
-    if settings.EXCEPTION_HANDLING:
-      exit_with_error('Wasm SjLj is not supported with Wasm exceptions yet')
 
   return (newargs, input_files)
 

tests/core/test_exceptions_longjmp4.cpp

@@ -0,0 +1,29 @@
+#include <stdio.h>
+#include <setjmp.h>
+
+static jmp_buf buf;
+
+void foo() {
+  throw 3;
+}
+
+int main() {
+  int jmpval = setjmp(buf);
+  if (jmpval != 0) {
+    // This is not reached, because foo() doesn't longjmp. This test checks
+    // compilation of a setjmp call with a nested try.
+    printf("setjmp returned for the second time\n");
+    return 0;
+  }
+  try {
+    foo();
+    try {
+      foo();
+    } catch (int n) {
+      printf("inner catch: caught %d\n", n);
+    }
+  } catch (int n) {
+    printf("outer catch: caught %d\n", n);
+  }
+  return 0;
+}

tests/core/test_exceptions_longjmp4.out

@@ -0,0 +1 @@
+outer catch: caught 3