[wasm] TrapIf and TrapUnless TurboFan operators implemented on ia32.

src/compiler/wasm-compiler.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/wasm-compiler.h"
 
 #include <memory>
 
 #include "src/isolate-inl.h"
 
@@ skipping 150 matching lines @@
                   position);
     return builder_->Control();
   }
 
   // Add a check that traps if {node} is zero.
   Node* ZeroCheck64(wasm::TrapReason reason, Node* node,
                     wasm::WasmCodePosition position) {
     return TrapIfEq64(reason, node, 0, position);
   }
 
-  int32_t GetFunctionIdForTrap(wasm::TrapReason reason) {
-    int32_t trap_id;
+  Runtime::FunctionId GetFunctionIdForTrap(wasm::TrapReason reason) {
     if (builder_->module_ && !builder_->module_->instance->context.is_null()) {
-      trap_id = wasm::WasmOpcodes::TrapReasonToFunctionId(reason);
+      switch (reason) {
+#define TRAPREASON_TO_MESSAGE(name) \
+  case wasm::k##name:               \
+    return Runtime::kThrowWasm##name;
+        FOREACH_WASM_TRAPREASON(TRAPREASON_TO_MESSAGE)
+#undef TRAPREASON_TO_MESSAGE
+        default:
+          UNREACHABLE();
+          return Runtime::kNumFunctions;
+      }
     } else {
       // We use Runtime::kNumFunctions as a marker to tell the code generator
       // to generate a call to a testing c-function instead of a runtime
       // function. This code should only be called from a cctest.
-      trap_id = Runtime::kNumFunctions;
+      return Runtime::kNumFunctions;
     }
-    return trap_id;
   }
 
-#if V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32
 #define WASM_TRAP_IF_SUPPORTED
 #endif
 
   // Add a trap if {cond} is true.
   void AddTrapIfTrue(wasm::TrapReason reason, Node* cond,
                      wasm::WasmCodePosition position) {
 #ifdef WASM_TRAP_IF_SUPPORTED
     if (FLAG_wasm_trap_if) {
       int32_t trap_id = GetFunctionIdForTrap(reason);
       Node* node = graph()->NewNode(common()->TrapIf(trap_id), cond,
                                     builder_->Effect(), builder_->Control());
       *builder_->control_ = node;
       builder_->SetSourcePosition(node, position);
       return;
     }
-#endif  // V8_TARGET_ARCH_X64
+#endif  // WASM_TRAP_IF_SUPPORTED
     BuildTrapIf(reason, cond, true, position);
   }
 
   // Add a trap if {cond} is false.
   void AddTrapIfFalse(wasm::TrapReason reason, Node* cond,
                       wasm::WasmCodePosition position) {
 #ifdef WASM_TRAP_IF_SUPPORTED
     if (FLAG_wasm_trap_if) {
       int32_t trap_id = GetFunctionIdForTrap(reason);
 
       Node* node = graph()->NewNode(common()->TrapUnless(trap_id), cond,
                                     builder_->Effect(), builder_->Control());
       *builder_->control_ = node;
       builder_->SetSourcePosition(node, position);
       return;
     }
-#endif  // V8_TARGET_ARCH_X64
+#endif  // WASM_TRAP_IF_SUPPORTED
 
     BuildTrapIf(reason, cond, false, position);
   }
 
   // Add a trap if {cond} is true or false according to {iftrue}.
   void BuildTrapIf(wasm::TrapReason reason, Node* cond, bool iftrue,
                    wasm::WasmCodePosition position) {
     Node** effect_ptr = builder_->effect_;
     Node** control_ptr = builder_->control_;
     Node* before = *effect_ptr;
@@ skipping 3424 matching lines @@
                       Smi::FromInt(instruction.instr_offset));
     fn_protected->set(Code::kTrapDataSize * i + Code::kTrapLandingOffset,
                       Smi::FromInt(instruction.landing_offset));
   }
   return fn_protected;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8