[wasm] Put the condition last in kExprBrIf.

src/wasm/wasm-macro-gen.h

 // 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.
 
 #ifndef V8_WASM_MACRO_GEN_H_
 #define V8_WASM_MACRO_GEN_H_
 
 #include "src/wasm/wasm-opcodes.h"
 
 // Convenience macros for building Wasm bytecode directly into a byte array.
 
 //------------------------------------------------------------------------------
 // Control.
 //------------------------------------------------------------------------------
 #define WASM_NOP kExprNop
 
 #define WASM_BLOCK(count, ...) kExprBlock, static_cast<byte>(count), __VA_ARGS__
 #define WASM_INFINITE_LOOP kExprLoop, 1, kExprBr, 0, kExprNop
 #define WASM_LOOP(count, ...) kExprLoop, static_cast<byte>(count), __VA_ARGS__
 #define WASM_IF(cond, tstmt) kExprIf, cond, tstmt
 #define WASM_IF_ELSE(cond, tstmt, fstmt) kExprIfElse, cond, tstmt, fstmt
 #define WASM_SELECT(cond, tval, fval) kExprSelect, cond, tval, fval
 #define WASM_BR(depth) kExprBr, static_cast<byte>(depth), kExprNop
 #define WASM_BR_IF(depth, cond) \
-  kExprBrIf, static_cast<byte>(depth), cond, kExprNop
+  kExprBrIf, static_cast<byte>(depth), kExprNop, cond
 #define WASM_BRV(depth, val) kExprBr, static_cast<byte>(depth), val
-#define WASM_BRV_IF(depth, cond, val) \
-  kExprBrIf, static_cast<byte>(depth), cond, val
+#define WASM_BRV_IF(depth, val, cond) \
+  kExprBrIf, static_cast<byte>(depth), val, cond
 #define WASM_BREAK(depth) kExprBr, static_cast<byte>(depth + 1), kExprNop
 #define WASM_CONTINUE(depth) kExprBr, static_cast<byte>(depth), kExprNop
 #define WASM_BREAKV(depth, val) kExprBr, static_cast<byte>(depth + 1), val
 #define WASM_RETURN0 kExprReturn
 #define WASM_RETURN(...) kExprReturn, __VA_ARGS__
 #define WASM_UNREACHABLE kExprUnreachable
 
 #define WASM_TABLESWITCH_OP(case_count, table_count, ...)                 \
   kExprTableSwitch, static_cast<byte>(case_count),                        \
       static_cast<byte>(case_count >> 8), static_cast<byte>(table_count), \
@@ skipping 217 matching lines @@
 #define WASM_F64_SCONVERT_I32(x) kExprF64SConvertI32, x
 #define WASM_F64_UCONVERT_I32(x) kExprF64UConvertI32, x
 #define WASM_F64_SCONVERT_I64(x) kExprF64SConvertI64, x
 #define WASM_F64_UCONVERT_I64(x) kExprF64UConvertI64, x
 #define WASM_F64_CONVERT_F32(x) kExprF64ConvertF32, x
 #define WASM_F64_REINTERPRET_I64(x) kExprF64ReinterpretI64, x
 #define WASM_I32_REINTERPRET_F32(x) kExprI32ReinterpretF32, x
 #define WASM_I64_REINTERPRET_F64(x) kExprI64ReinterpretF64, x
 
 #endif  // V8_WASM_MACRO_GEN_H_