Revert of [wasm] Initial signal handler

src/wasm/wasm-module.cc

Index: src/wasm/wasm-module.cc
diff --git a/src/wasm/wasm-module.cc b/src/wasm/wasm-module.cc
index e7b316293c737b9a1bef982c9adca7d2da7b2f4b..75a556971d521f7b515201b551598f77fa4c9364 100644
--- a/src/wasm/wasm-module.cc
+++ b/src/wasm/wasm-module.cc
@@ -14,7 +14,6 @@
 #include "src/property-descriptor.h"
 #include "src/simulator.h"
 #include "src/snapshot/snapshot.h"
-#include "src/trap-handler/trap-handler.h"
 #include "src/v8.h"
 
 #include "src/asmjs/asm-wasm-builder.h"
@@ -670,18 +669,6 @@
   TRACE("Finalizing %d {\n", compiled_module->instance_id());
   DCHECK(compiled_module->has_weak_wasm_module());
   WeakCell* weak_wasm_module = compiled_module->ptr_to_weak_wasm_module();
-
-  if (trap_handler::UseTrapHandler()) {
-    Handle<FixedArray> code_table = compiled_module->code_table();
-    for (int i = 0; i < code_table->length(); ++i) {
-      Handle<Code> code = code_table->GetValueChecked<Code>(isolate, i);
-      int index = code->trap_handler_index()->value();
-      if (index >= 0) {
-        trap_handler::ReleaseHandlerData(index);
-        code->set_trap_handler_index(Smi::FromInt(-1));
-      }
-    }
-  }
 
   // weak_wasm_module may have been cleared, meaning the module object
   // was GC-ed. In that case, there won't be any new instances created,
@@ -1237,7 +1224,7 @@
     //--------------------------------------------------------------------------
     // Unpack and notify signal handler of protected instructions.
     //--------------------------------------------------------------------------
-    if (trap_handler::UseTrapHandler()) {
+    if (FLAG_wasm_trap_handler) {
       for (int i = 0; i < code_table->length(); ++i) {
         Handle<Code> code = code_table->GetValueChecked<Code>(isolate_, i);
 
@@ -1258,15 +1245,8 @@
               reinterpret_cast<intptr_t>(it.rinfo()->pc()) - base;
           unpacked.emplace_back(data);
         }
-        if (unpacked.size() > 0) {
-          int size = code->CodeSize();
-          const int index =
-              RegisterHandlerData(reinterpret_cast<void*>(base), size,
-                                  unpacked.size(), &unpacked[0]);
-          // TODO(eholk): if index is negative, fail.
-          DCHECK(index >= 0);
-          code->set_trap_handler_index(Smi::FromInt(index));
-        }
+        // TODO(eholk): Register the protected instruction information once the
+        // trap handler is in place.
       }
     }