coerce arguments to cxa_find_matching_catch; enable remaining asm.js exceptions tests

2 files changed, 1 insertions, 3 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index fb5e9a5f..262dd3eb 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -1210,7 +1210,7 @@ function JSify(data, functionsOnly, givenFunctions) {
     }
   });
   makeFuncLineActor('landingpad', function(item) {
-    var catchTypeArray = item.catchables.map(finalizeLLVMParameter).join(',');
+    var catchTypeArray = item.catchables.map(finalizeLLVMParameter).map(function(element) { return asmCoercion(element, 'i32') }).join(',');
     var ret = asmCoercion('___cxa_find_matching_catch(-1, -1' + (catchTypeArray.length > 0 ? ',' + catchTypeArray : '') +')', 'i32');
     if (USE_TYPED_ARRAYS == 2) {
       ret = makeVarDef(item.assignTo) + '$0 = ' + ret + '; ' + item.assignTo + '$1 = tempRet0;';
diff --git a/tests/runner.py b/tests/runner.py
index def4bfc9..890d42e7 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -2646,7 +2646,6 @@ Exception execution path of first function! 1
         self.do_run(src, 'success')
 
     def test_typed_exceptions(self):
-        if Settings.ASM_JS: return self.skip('no exceptions support in asm')
         Settings.DISABLE_EXCEPTION_CATCHING = 0
         Settings.SAFE_HEAP = 0  # Throwing null will cause an ignorable null pointer access.
         src = open(path_from_root('tests', 'exceptions', 'typed.cpp'), 'r').read()
@@ -2654,7 +2653,6 @@ Exception execution path of first function! 1
         self.do_run(src, expected)
 
     def test_multiexception(self):
-      if Settings.ASM_JS: return self.skip('no exceptions support in asm')
       Settings.DISABLE_EXCEPTION_CATCHING = 0
       src = r'''
 #include <stdio.h>