3 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/s2wasm.cpp b/src/tools/s2wasm.cpp
index 8411d4046..2556cf482 100644
--- a/src/tools/s2wasm.cpp
+++ b/src/tools/s2wasm.cpp
@@ -195,7 +195,7 @@ int main(int argc, const char *argv[]) {
   if (options.extra["validate"] != "none") {
     if (options.debug) std::cerr << "Validating..." << std::endl;
     if (!wasm::WasmValidator().validate(linker.getOutput().wasm,
-        options.extra["validate"] == "web")) {
+         WasmValidator::Globally | (options.extra["validate"] == "web" ? WasmValidator::Web : 0))) {
       Fatal() << "Error: linked module is not valid.\n";
     }
   }
diff --git a/src/tools/wasm-as.cpp b/src/tools/wasm-as.cpp
index d4b495562..956ad213f 100644
--- a/src/tools/wasm-as.cpp
+++ b/src/tools/wasm-as.cpp
@@ -93,7 +93,7 @@ int main(int argc, const char *argv[]) {
   if (options.extra["validate"] != "none") {
     if (options.debug) std::cerr << "Validating..." << std::endl;
     if (!wasm::WasmValidator().validate(wasm,
-        options.extra["validate"] == "web")) {
+         WasmValidator::Globally | (options.extra["validate"] == "web" ? WasmValidator::Web : 0))) {
       Fatal() << "Error: input module is not valid.\n";
     }
   }
diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp
index 29484cc7a..90ae9bbe6 100644
--- a/src/tools/wasm-reduce.cpp
+++ b/src/tools/wasm-reduce.cpp
@@ -414,7 +414,8 @@ struct Reducer : public WalkerPass<PostWalker<Reducer, UnifiedExpressionVisitor<
     }
     for (auto& func : functions) {
       curr->removeFunction(func.name);
-      if (WasmValidator().validate(*curr, false, true, true /* override quiet */) && writeAndTestReduction()) {
+      if (WasmValidator().validate(*curr, WasmValidator::Globally | WasmValidator::Quiet) &&
+          writeAndTestReduction()) {
         std::cerr << "|      removed function " << func.name << '\n';
         noteReduction();
       } else {