Index: test/cctest/wasm/wasm-run-utils.h |
diff --git a/test/cctest/wasm/wasm-run-utils.h b/test/cctest/wasm/wasm-run-utils.h |
index b35a9c0a7b1a85faf57f3ad3b4a736cc5e03c969..9c883fa5fa005aba8b64ad634b0dbc5ba8e7fb26 100644 |
--- a/test/cctest/wasm/wasm-run-utils.h |
+++ b/test/cctest/wasm/wasm-run-utils.h |
@@ -23,7 +23,6 @@ |
#include "src/compiler/pipeline.h" |
#include "src/compiler/wasm-compiler.h" |
#include "src/compiler/zone-stats.h" |
-#include "src/trap-handler/trap-handler.h" |
#include "src/wasm/function-body-decoder.h" |
#include "src/wasm/wasm-external-refs.h" |
#include "src/wasm/wasm-interpreter.h" |
@@ -823,29 +822,17 @@ |
TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \ |
void RunWasm_##name(WasmExecutionMode execution_mode) |
-#define WASM_EXEC_TEST_WITH_TRAP(name) \ |
- void RunWasm_##name(WasmExecutionMode execution_mode); \ |
- TEST(RunWasmCompiled_##name) { \ |
- if (trap_handler::UseTrapHandler()) { \ |
- return; \ |
- } \ |
- RunWasm_##name(kExecuteCompiled); \ |
- } \ |
- TEST(RunWasmCompiledWithoutTrapIf_##name) { \ |
- if (trap_handler::UseTrapHandler()) { \ |
- return; \ |
- } \ |
- bool trap_if = FLAG_wasm_trap_if; \ |
- FLAG_wasm_trap_if = true; \ |
- RunWasm_##name(kExecuteCompiled); \ |
- FLAG_wasm_trap_if = trap_if; \ |
- } \ |
- TEST(RunWasmInterpreted_##name) { \ |
- if (trap_handler::UseTrapHandler()) { \ |
- return; \ |
- } \ |
- RunWasm_##name(kExecuteInterpreted); \ |
- } \ |
+#define WASM_EXEC_TEST_WITH_TRAP(name) \ |
+ void RunWasm_##name(WasmExecutionMode execution_mode); \ |
+ TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); } \ |
+ void RunWasm_##name(WasmExecutionMode execution_mode); \ |
+ TEST(RunWasmCompiledWithoutTrapIf_##name) { \ |
+ bool trap_if = FLAG_wasm_trap_if; \ |
+ FLAG_wasm_trap_if = false; \ |
+ RunWasm_##name(kExecuteCompiled); \ |
+ FLAG_wasm_trap_if = trap_if; \ |
+ } \ |
+ TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \ |
void RunWasm_##name(WasmExecutionMode execution_mode) |
#define WASM_EXEC_COMPILED_TEST(name) \ |