fix auto-returns after aborts in float-returning functions, and enable poppler in asm

2 files changed, 1 insertions, 2 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index ac8b263e..2c0332e3 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -1460,7 +1460,7 @@ function JSify(data, functionsOnly, givenFunctions) {
     if (ASM_JS) { // TODO: do only when needed (library functions and Math.*?) XXX && simpleIdent in Functions.libraryFunctions) {
       ret = asmCoercion(ret, returnType);
       if (simpleIdent == 'abort' && funcData.returnType != 'void') {
-        ret += '; return 0'; // special case: abort() can happen without return, breaking the return type of asm functions. ensure a return
+        ret += '; return ' + asmCoercion('0', funcData.returnType); // special case: abort() can happen without return, breaking the return type of asm functions. ensure a return
       }
     }
 
diff --git a/tests/runner.py b/tests/runner.py
index c8580923..b94affb2 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7677,7 +7677,6 @@ def process(filename):
 
     def test_poppler(self):
       if self.emcc_args is None: return self.skip('very slow, we only do this in emcc runs')
-      if Settings.ASM_JS: return self.skip('asm does not support relying on function pointers being cast to different types')
 
       Settings.CORRECT_OVERFLOWS = 1
       Settings.CORRECT_SIGNS = 1