[wasm] Initial signal handler

test/cctest/wasm/test-run-wasm.cc

Index: test/cctest/wasm/test-run-wasm.cc
diff --git a/test/cctest/wasm/test-run-wasm.cc b/test/cctest/wasm/test-run-wasm.cc
index 7a41327bf2a25a64fe91a2b8984acb99cc27d069..b78af6ff755499e1e919ed311218052e66d1cc50 100644
--- a/test/cctest/wasm/test-run-wasm.cc
+++ b/test/cctest/wasm/test-run-wasm.cc
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include "src/base/platform/elapsed-timer.h"
+#include "src/trap-handler/trap-handler.h"
 #include "src/utils.h"
 #include "src/wasm/wasm-macro-gen.h"
 
@@ -1083,6 +1084,11 @@ WASM_EXEC_TEST(I32ReinterpretF32) {
 }
 
 WASM_EXEC_TEST_WITH_TRAP(LoadMaxUint32Offset) {
+  if (trap_handler::EnableTrapHandler()) {

[titzer, 2017/01/09 09:26:56]

I think this is because we'd need to put the trap handler data registration into
either compiler/wasm-compiler.cc or into compiler/pipeline.cc. In addition to
that, we'd have to make the code generated for the trap handler landing pads
work in cctests as well.

Recommend changing the definition of WASM_EXEC_TEST_WITH_TRAP to do this check.

[Eric Holk, 2017/01/10 23:10:48]

Done.

+    // cctests don't register the handler data, so this test won't work
+    // TODO(eholk): find out why and fix it.
+    return;
+  }
   WasmRunner<int32_t> r(execution_mode);
   r.module().AddMemoryElems<int32_t>(8);
 
@@ -1474,6 +1480,13 @@ WASM_EXEC_TEST(LoadMemI32_alignment) {
 }
 
 WASM_EXEC_TEST_WITH_TRAP(LoadMemI32_oob) {
+  if (trap_handler::EnableTrapHandler()) {
+    // With trap handlers enabled, we need additional guard pages and such set
+    // up. This path does not enable these, so we skip this test. The behavior
+    // covered by this tests is also covered by mjsunit tests, such as
+    // test/mjsunit/wasm/import-memory.js
+    return;
+  }
   WasmRunner<int32_t, uint32_t> r(execution_mode);
   int32_t* memory = r.module().AddMemoryElems<int32_t>(8);
   r.module().RandomizeMemory(1111);
@@ -1492,6 +1505,13 @@ WASM_EXEC_TEST_WITH_TRAP(LoadMemI32_oob) {
 }
 
 WASM_EXEC_TEST_WITH_TRAP(LoadMem_offset_oob) {
+  if (trap_handler::EnableTrapHandler()) {
+    // With trap handlers enabled, we need additional guard pages and such set
+    // up. This path does not enable these, so we skip this test. The behavior
+    // covered by this tests is also covered by mjsunit tests, such as
+    // test/mjsunit/wasm/import-memory.js
+    return;
+  }
   static const MachineType machineTypes[] = {
       MachineType::Int8(),   MachineType::Uint8(),  MachineType::Int16(),
       MachineType::Uint16(), MachineType::Int32(),  MachineType::Uint32(),
@@ -1541,6 +1561,13 @@ WASM_EXEC_TEST(LoadMemI32_offset) {
 }
 
 WASM_EXEC_TEST_WITH_TRAP(LoadMemI32_const_oob_misaligned) {
+  if (trap_handler::EnableTrapHandler()) {
+    // With trap handlers enabled, we need additional guard pages and such set
+    // up. This path does not enable these, so we skip this test. The behavior
+    // covered by this tests is also covered by mjsunit tests, such as
+    // test/mjsunit/wasm/import-memory.js
+    return;
+  }
   const int kMemSize = 12;
   // TODO(titzer): Fix misaligned accesses on MIPS and re-enable.
   for (int offset = 0; offset < kMemSize + 5; ++offset) {
@@ -1562,6 +1589,13 @@ WASM_EXEC_TEST_WITH_TRAP(LoadMemI32_const_oob_misaligned) {
 }
 
 WASM_EXEC_TEST_WITH_TRAP(LoadMemI32_const_oob) {
+  if (trap_handler::EnableTrapHandler()) {
+    // With trap handlers enabled, we need additional guard pages and such set
+    // up. This path does not enable these, so we skip this test. The behavior
+    // covered by this tests is also covered by mjsunit tests, such as
+    // test/mjsunit/wasm/import-memory.js
+    return;
+  }
   const int kMemSize = 24;
   for (int offset = 0; offset < kMemSize + 5; offset += 4) {
     for (int index = 0; index < kMemSize + 5; index += 4) {
@@ -1622,6 +1656,13 @@ WASM_EXEC_TEST(StoreMemI32_offset) {
 }
 
 WASM_EXEC_TEST_WITH_TRAP(StoreMem_offset_oob) {
+  if (trap_handler::EnableTrapHandler()) {
+    // With trap handlers enabled, we need additional guard pages and such set
+    // up. This path does not enable these, so we skip this test. The behavior
+    // covered by this tests is also covered by mjsunit tests, such as
+    // test/mjsunit/wasm/import-memory.js
+    return;
+  }
   // 64-bit cases are handled in test-run-wasm-64.cc
   static const MachineType machineTypes[] = {
       MachineType::Int8(),    MachineType::Uint8(),  MachineType::Int16(),