ensure explicit floats in function call arguments and all coercions

2 files changed, 16 insertions, 8 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index 83ddc62e..5fbea5ba 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -1313,8 +1313,12 @@ function JSify(data, functionsOnly, givenFunctions) {
     });
 
     args = args.map(function(arg, i) { return indexizeFunctions(arg, argsTypes[i]) });
-    if (ASM_JS && shortident in Functions.libraryFunctions) {
-      args = args.map(function(arg, i) { return asmCoercion(arg, argsTypes[i]) });
+    if (ASM_JS) {
+      if (shortident in Functions.libraryFunctions) {
+        args = args.map(function(arg, i) { return asmCoercion(arg, argsTypes[i]) });
+      } else {
+        args = args.map(function(arg, i) { return asmEnsureFloat(arg, argsTypes[i]) });
+      }
     }
 
     varargs = varargs.map(function(vararg, i) {
diff --git a/src/parseTools.js b/src/parseTools.js
index 268d0e24..e0c99c52 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -1019,14 +1019,18 @@ function asmCoercion(value, type, signedness) {
   if (type == 'void') {
     return value;
   } else if (type in Runtime.FLOAT_TYPES) {
-    if (signedness) {
-      if (signedness == 'u') {
-        value = '(' + value + ')>>>0';
-      } else {
-        value = '(' + value + ')|0';
+    if (isNumber(value)) {
+      return asmEnsureFloat(value, type);
+    } else {
+      if (signedness) {
+        if (signedness == 'u') {
+          value = '(' + value + ')>>>0';
+        } else {
+          value = '(' + value + ')|0';
+        }
       }
+      return '(+(' + value + '))';
     }
-    return '(+(' + value + '))';
   } else {
     return '((' + value + ')|0)';
   }