4 files changed, 7 insertions, 19 deletions
diff --git a/src/emscripten-optimizer/optimizer-shared.cpp b/src/emscripten-optimizer/optimizer-shared.cpp
index 172b9f45f..d763dc17d 100644
--- a/src/emscripten-optimizer/optimizer-shared.cpp
+++ b/src/emscripten-optimizer/optimizer-shared.cpp
@@ -189,7 +189,7 @@ AsmSign detectSign(Ref node, IString minifiedFround) {
     if (value < 0) {
       return ASM_SIGNED;
     }
-    if (value > uint32_t(-1) || fmod(value, 1) != 0) {
+    if (value > uint32_t(-1) || !wasm::isInteger(value)) {
       return ASM_NONSIGNED;
     }
     if (wasm::isSInteger32(value)) {
diff --git a/src/emscripten-optimizer/simple_ast.h b/src/emscripten-optimizer/simple_ast.h
index be5b4fa21..70ecb2acd 100644
--- a/src/emscripten-optimizer/simple_ast.h
+++ b/src/emscripten-optimizer/simple_ast.h
@@ -256,7 +256,7 @@ struct Value {
   AssignName* asAssignName();
 
   int32_t getInteger() { // convenience function to get a known integer
-    assert(fmod(getNumber(), 1) == 0);
+    assert(wasm::isInteger(getNumber()));
     int32_t ret = getNumber();
     assert(double(ret) == getNumber()); // no loss in conversion
     return ret;
@@ -944,7 +944,7 @@ struct JSPrinter {
       d = -d;
     }
     // try to emit the fewest necessary characters
-    bool integer = fmod(d, 1) == 0;
+    bool integer = wasm::isInteger(d);
 #define BUFFERSIZE 1000
     // f is normal, e is scientific for float, x for integer
     static char full_storage_f[BUFFERSIZE], full_storage_e[BUFFERSIZE];
diff --git a/src/support/bits.cpp b/src/support/bits.cpp
index 7e22466d8..03fb66252 100644
--- a/src/support/bits.cpp
+++ b/src/support/bits.cpp
@@ -158,22 +158,10 @@ int ceilLog2(uint32_t v) { return 32 - countLeadingZeroes(v - 1); }
 int ceilLog2(uint64_t v) { return 64 - countLeadingZeroes(v - 1); }
 
 uint32_t log2(uint32_t v) {
-  switch (v) {
-    default:
-      WASM_UNREACHABLE("invalid value");
-    case 1:
-      return 0;
-    case 2:
-      return 1;
-    case 4:
-      return 2;
-    case 8:
-      return 3;
-    case 16:
-      return 4;
-    case 32:
-      return 5;
+  if (!isPowerOf2(v)) {
+    WASM_UNREACHABLE("value should be a power of two");
   }
+  return 31 - countLeadingZeroes(v);
 }
 
 uint32_t pow2(uint32_t v) { return 1 << v; }
diff --git a/src/support/json.h b/src/support/json.h
index d31fcf59b..be4a6c250 100644
--- a/src/support/json.h
+++ b/src/support/json.h
@@ -193,7 +193,7 @@ struct Value {
   }
 
   int32_t getInteger() { // convenience function to get a known integer
-    assert(fmod(getNumber(), 1) == 0);
+    assert(wasm::isInteger(getNumber()));
     int32_t ret = getNumber();
     assert(double(ret) == getNumber()); // no loss in conversion
     return ret;