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

src/wasm/wasm-opcodes.h

Index: src/wasm/wasm-opcodes.h
diff --git a/src/wasm/wasm-opcodes.h b/src/wasm/wasm-opcodes.h
index 3129c4ccf3960b0bf994eb1f0abea3c0f0905217..2afeff0e85dc64a60387cfa598f3ba95bdb8abde 100644
--- a/src/wasm/wasm-opcodes.h
+++ b/src/wasm/wasm-opcodes.h
@@ -7,6 +7,7 @@
 
 #include "src/globals.h"
 #include "src/machine-type.h"
+#include "src/runtime/runtime.h"

[titzer, 2016/12/15 14:21:08]

I think it's best not to include the runtime header into the opcodes header for
WASM. This is only needed because the runtime header defines an enum. Is there
another place to put the helper function?

[ahaas, 2016/12/15 16:55:51]

I moved the function to wasm-compiler.cc

 #include "src/signature.h"
 
 namespace v8 {
@@ -533,7 +534,7 @@ class V8_EXPORT_PRIVATE WasmOpcodes {
 
   static int TrapReasonToMessageId(TrapReason reason);
   static const char* TrapReasonMessage(TrapReason reason);
-  static int32_t TrapReasonToFunctionId(TrapReason reason);
+  static Runtime::FunctionId TrapReasonToFunctionId(TrapReason reason);
 
   static byte MemSize(MachineType type) {
     return 1 << ElementSizeLog2Of(type.representation());