[wasm] Rename wasm::LocalType to wasm::ValueType and kAst* to kWasm*

test/unittests/wasm/function-body-decoder-unittest.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 "test/unittests/test-utils.h"
 
 #include "src/v8.h"
 
 #include "test/common/wasm/test-signatures.h"
 
@@ skipping 14 matching lines @@
 #define B3(a, b, c) WASM_BLOCK(a, b, c)
 
 #define WASM_IF_OP kExprIf, kLocalVoid
 #define WASM_LOOP_OP kExprLoop, kLocalVoid
 
 static const byte kCodeGetLocal0[] = {kExprGetLocal, 0};
 static const byte kCodeGetLocal1[] = {kExprGetLocal, 1};
 static const byte kCodeSetLocal0[] = {WASM_SET_LOCAL(0, WASM_ZERO)};
 static const byte kCodeTeeLocal0[] = {WASM_TEE_LOCAL(0, WASM_ZERO)};
 
-static const LocalType kLocalTypes[] = {kAstI32, kAstI64, kAstF32, kAstF64};
+static const ValueType kValueTypes[] = {kWasmI32, kWasmI64, kWasmF32, kWasmF64};
 static const MachineType machineTypes[] = {
     MachineType::Int8(),   MachineType::Uint8(),  MachineType::Int16(),
     MachineType::Uint16(), MachineType::Int32(),  MachineType::Uint32(),
     MachineType::Int64(),  MachineType::Uint64(), MachineType::Float32(),
     MachineType::Float64()};
 
 static const WasmOpcode kInt32BinopOpcodes[] = {
     kExprI32Add,  kExprI32Sub,  kExprI32Mul,  kExprI32DivS, kExprI32DivU,
     kExprI32RemS, kExprI32RemU, kExprI32And,  kExprI32Ior,  kExprI32Xor,
     kExprI32Shl,  kExprI32ShrU, kExprI32ShrS, kExprI32Eq,   kExprI32LtS,
@@ skipping 32 matching lines @@
 #define EXPECT_FAILURE(sig, ...)                           \
   do {                                                     \
     static const byte code[] = {__VA_ARGS__};              \
     Verify(kError, sigs.sig(), code, code + sizeof(code)); \
   } while (false)
 
 static bool old_eh_flag;
 
 class FunctionBodyDecoderTest : public TestWithZone {
  public:
-  typedef std::pair<uint32_t, LocalType> LocalsDecl;
+  typedef std::pair<uint32_t, ValueType> LocalsDecl;
 
   FunctionBodyDecoderTest() : module(nullptr), local_decls(zone()) {}
 
   static void SetUpTestCase() { old_eh_flag = FLAG_wasm_eh_prototype; }
 
   static void TearDownTestCase() {
     // Reset the wasm_eh_prototype flag
     FLAG_wasm_eh_prototype = old_eh_flag;
   }
 
   TestSignatures sigs;
   ModuleEnv* module;
   LocalDeclEncoder local_decls;
 
-  void AddLocals(LocalType type, uint32_t count) {
+  void AddLocals(ValueType type, uint32_t count) {
     local_decls.AddLocals(count, type);
   }
 
   // Prepends local variable declarations and renders nice error messages for
   // verification failures.
   void Verify(ErrorCode expected, FunctionSig* sig, const byte* start,
               const byte* end) {
     local_decls.Prepend(zone(), &start, &end);
     // Verify the code.
     DecodeResult result =
@@ skipping 18 matching lines @@
       EXPECT_TRUE(false) << str.str().c_str();
     }
   }
 
   void TestBinop(WasmOpcode opcode, FunctionSig* success) {
     // op(local[0], local[1])
     byte code[] = {WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
     EXPECT_VERIFIES_SC(success, code);
 
     // Try all combinations of return and parameter types.
-    for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-      for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-        for (size_t k = 0; k < arraysize(kLocalTypes); k++) {
-          LocalType types[] = {kLocalTypes[i], kLocalTypes[j], kLocalTypes[k]};
+    for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+      for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+        for (size_t k = 0; k < arraysize(kValueTypes); k++) {
+          ValueType types[] = {kValueTypes[i], kValueTypes[j], kValueTypes[k]};
           if (types[0] != success->GetReturn(0) ||
               types[1] != success->GetParam(0) ||
               types[2] != success->GetParam(1)) {
             // Test signature mismatch.
             FunctionSig sig(1, 2, types);
             EXPECT_FAILURE_SC(&sig, code);
           }
         }
       }
     }
   }
 
   void TestUnop(WasmOpcode opcode, FunctionSig* success) {
     TestUnop(opcode, success->GetReturn(), success->GetParam(0));
   }
 
-  void TestUnop(WasmOpcode opcode, LocalType ret_type, LocalType param_type) {
+  void TestUnop(WasmOpcode opcode, ValueType ret_type, ValueType param_type) {
     // Return(op(local[0]))
     byte code[] = {WASM_UNOP(opcode, WASM_GET_LOCAL(0))};
     {
-      LocalType types[] = {ret_type, param_type};
+      ValueType types[] = {ret_type, param_type};
       FunctionSig sig(1, 1, types);
       EXPECT_VERIFIES_SC(&sig, code);
     }
 
     // Try all combinations of return and parameter types.
-    for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-      for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-        LocalType types[] = {kLocalTypes[i], kLocalTypes[j]};
+    for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+      for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+        ValueType types[] = {kValueTypes[i], kValueTypes[j]};
         if (types[0] != ret_type || types[1] != param_type) {
           // Test signature mismatch.
           FunctionSig sig(1, 1, types);
           EXPECT_FAILURE_SC(&sig, code);
         }
       }
     }
   }
 };
 
@@ skipping 66 matching lines @@
   for (int size = 1; size <= 4; size++) {
     Verify(kError, sigs.i_i(), code, code + size);
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal0_param) {
   EXPECT_VERIFIES_C(i_i, kCodeGetLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal0_local) {
-  AddLocals(kAstI32, 1);
+  AddLocals(kWasmI32, 1);
   EXPECT_VERIFIES_C(i_v, kCodeGetLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, TooManyLocals) {
-  AddLocals(kAstI32, 4034986500);
+  AddLocals(kWasmI32, 4034986500);
   EXPECT_FAILURE_C(i_v, kCodeGetLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal0_param_n) {
   FunctionSig* array[] = {sigs.i_i(), sigs.i_ii(), sigs.i_iii()};
 
   for (size_t i = 0; i < arraysize(array); i++) {
     EXPECT_VERIFIES_SC(array[i], kCodeGetLocal0);
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocalN_local) {
   for (byte i = 1; i < 8; i++) {
-    AddLocals(kAstI32, 1);
+    AddLocals(kWasmI32, 1);
     for (byte j = 0; j < i; j++) {
       byte code[] = {kExprGetLocal, j};
       EXPECT_VERIFIES_C(i_v, code);
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal0_fail_no_params) {
   EXPECT_FAILURE_C(i_v, kCodeGetLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal1_fail_no_locals) {
   EXPECT_FAILURE_C(i_i, kCodeGetLocal1);
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal_off_end) {
   static const byte code[] = {kExprGetLocal};
   EXPECT_FAILURE_C(i_i, code);
 }
 
 TEST_F(FunctionBodyDecoderTest, NumLocalBelowLimit) {
-  AddLocals(kAstI32, kMaxNumWasmLocals - 1);
+  AddLocals(kWasmI32, kMaxNumWasmLocals - 1);
   EXPECT_VERIFIES(v_v, WASM_NOP);
 }
 
 TEST_F(FunctionBodyDecoderTest, NumLocalAtLimit) {
-  AddLocals(kAstI32, kMaxNumWasmLocals);
+  AddLocals(kWasmI32, kMaxNumWasmLocals);
   EXPECT_VERIFIES(v_v, WASM_NOP);
 }
 
 TEST_F(FunctionBodyDecoderTest, NumLocalAboveLimit) {
-  AddLocals(kAstI32, kMaxNumWasmLocals + 1);
+  AddLocals(kWasmI32, kMaxNumWasmLocals + 1);
   EXPECT_FAILURE(v_v, WASM_NOP);
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal_varint) {
   const int kMaxLocals = kMaxNumWasmLocals - 1;
-  AddLocals(kAstI32, kMaxLocals);
+  AddLocals(kWasmI32, kMaxLocals);
 
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_1(66));
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_2(7777));
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_3(8888));
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_4(9999));
 
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_5(kMaxLocals - 1));
 
   EXPECT_FAILURE(i_i, kExprGetLocal, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
 
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_4(kMaxLocals - 1));
   EXPECT_VERIFIES(i_i, kExprGetLocal, U32V_4(kMaxLocals));
   EXPECT_FAILURE(i_i, kExprGetLocal, U32V_4(kMaxLocals + 1));
 
   EXPECT_FAILURE(i_v, kExprGetLocal, U32V_4(kMaxLocals));
   EXPECT_FAILURE(i_v, kExprGetLocal, U32V_4(kMaxLocals + 1));
 }
 
 TEST_F(FunctionBodyDecoderTest, GetLocal_toomany) {
-  AddLocals(kAstI32, kMaxNumWasmLocals - 100);
-  AddLocals(kAstI32, 100);
+  AddLocals(kWasmI32, kMaxNumWasmLocals - 100);
+  AddLocals(kWasmI32, 100);
 
   EXPECT_VERIFIES(i_v, kExprGetLocal, U32V_1(66));
   EXPECT_FAILURE(i_i, kExprGetLocal, U32V_1(66));
 }
 
 TEST_F(FunctionBodyDecoderTest, Binops_off_end) {
   byte code1[] = {0};  // [opcode]
   for (size_t i = 0; i < arraysize(kInt32BinopOpcodes); i++) {
     code1[0] = kInt32BinopOpcodes[i];
     EXPECT_FAILURE_C(i_i, code1);
@@ skipping 48 matching lines @@
 
 TEST_F(FunctionBodyDecoderTest, TeeLocal0_param) {
   EXPECT_VERIFIES_C(i_i, kCodeTeeLocal0);
   EXPECT_FAILURE_C(f_ff, kCodeTeeLocal0);
   EXPECT_FAILURE_C(d_dd, kCodeTeeLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, SetLocal0_local) {
   EXPECT_FAILURE_C(i_v, kCodeSetLocal0);
   EXPECT_FAILURE_C(v_v, kCodeSetLocal0);
-  AddLocals(kAstI32, 1);
+  AddLocals(kWasmI32, 1);
   EXPECT_FAILURE_C(i_v, kCodeSetLocal0);
   EXPECT_VERIFIES_C(v_v, kCodeSetLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, TeeLocal0_local) {
   EXPECT_FAILURE_C(i_v, kCodeTeeLocal0);
-  AddLocals(kAstI32, 1);
+  AddLocals(kWasmI32, 1);
   EXPECT_VERIFIES_C(i_v, kCodeTeeLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, TeeLocalN_local) {
   for (byte i = 1; i < 8; i++) {
-    AddLocals(kAstI32, 1);
+    AddLocals(kWasmI32, 1);
     for (byte j = 0; j < i; j++) {
       EXPECT_FAILURE(v_v, WASM_TEE_LOCAL(j, WASM_I8(i)));
       EXPECT_VERIFIES(i_i, WASM_TEE_LOCAL(j, WASM_I8(i)));
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, BlockN) {
   const int kMaxSize = 200;
   byte buffer[kMaxSize + 3];
@@ skipping 239 matching lines @@
   EXPECT_VERIFIES(i_i, WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_UNREACHABLE,
                                       WASM_GET_LOCAL(0)));
   EXPECT_VERIFIES(i_i, WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
                                       WASM_UNREACHABLE));
 }
 
 TEST_F(FunctionBodyDecoderTest, IfElseUnreachable2) {
   static const byte code[] = {
       WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_UNREACHABLE, WASM_GET_LOCAL(0))};
 
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType types[] = {kAstI32, kLocalTypes[i]};
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType types[] = {kWasmI32, kValueTypes[i]};
     FunctionSig sig(1, 1, types);
 
-    if (kLocalTypes[i] == kAstI32) {
+    if (kValueTypes[i] == kWasmI32) {
       EXPECT_VERIFIES_SC(&sig, code);
     } else {
       EXPECT_FAILURE_SC(&sig, code);
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, IfBreak) {
   EXPECT_VERIFIES(v_i, WASM_IF(WASM_GET_LOCAL(0), WASM_BR(0)));
   EXPECT_VERIFIES(v_i, WASM_IF(WASM_GET_LOCAL(0), WASM_BR(1)));
@@ skipping 259 matching lines @@
   EXPECT_FAILURE_C(i_f, kCode);
   EXPECT_FAILURE_C(i_d, kCode);
 }
 
 TEST_F(FunctionBodyDecoderTest, Int64Local_param) {
   EXPECT_VERIFIES_C(l_l, kCodeGetLocal0);
 }
 
 TEST_F(FunctionBodyDecoderTest, Int64Locals) {
   for (byte i = 1; i < 8; i++) {
-    AddLocals(kAstI64, 1);
+    AddLocals(kWasmI64, 1);
     for (byte j = 0; j < i; j++) {
       EXPECT_VERIFIES(l_v, WASM_GET_LOCAL(j));
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, Int32Binops) {
   TestBinop(kExprI32Add, sigs.i_ii());
   TestBinop(kExprI32Sub, sigs.i_ii());
   TestBinop(kExprI32Mul, sigs.i_ii());
@@ skipping 30 matching lines @@
   TestBinop(kExprF32Sub, sigs.f_ff());
   TestBinop(kExprF32Mul, sigs.f_ff());
   TestBinop(kExprF32Div, sigs.f_ff());
 
   TestBinop(kExprF32Eq, sigs.i_ff());
   TestBinop(kExprF32Lt, sigs.i_ff());
   TestBinop(kExprF32Le, sigs.i_ff());
 }
 
 TEST_F(FunctionBodyDecoderTest, TypeConversions) {
-  TestUnop(kExprI32SConvertF32, kAstI32, kAstF32);
-  TestUnop(kExprI32SConvertF64, kAstI32, kAstF64);
-  TestUnop(kExprI32UConvertF32, kAstI32, kAstF32);
-  TestUnop(kExprI32UConvertF64, kAstI32, kAstF64);
-  TestUnop(kExprF64SConvertI32, kAstF64, kAstI32);
-  TestUnop(kExprF64UConvertI32, kAstF64, kAstI32);
-  TestUnop(kExprF64ConvertF32, kAstF64, kAstF32);
-  TestUnop(kExprF32SConvertI32, kAstF32, kAstI32);
-  TestUnop(kExprF32UConvertI32, kAstF32, kAstI32);
-  TestUnop(kExprF32ConvertF64, kAstF32, kAstF64);
+  TestUnop(kExprI32SConvertF32, kWasmI32, kWasmF32);
+  TestUnop(kExprI32SConvertF64, kWasmI32, kWasmF64);
+  TestUnop(kExprI32UConvertF32, kWasmI32, kWasmF32);
+  TestUnop(kExprI32UConvertF64, kWasmI32, kWasmF64);
+  TestUnop(kExprF64SConvertI32, kWasmF64, kWasmI32);
+  TestUnop(kExprF64UConvertI32, kWasmF64, kWasmI32);
+  TestUnop(kExprF64ConvertF32, kWasmF64, kWasmF32);
+  TestUnop(kExprF32SConvertI32, kWasmF32, kWasmI32);
+  TestUnop(kExprF32UConvertI32, kWasmF32, kWasmI32);
+  TestUnop(kExprF32ConvertF64, kWasmF32, kWasmF64);
 }
 
 TEST_F(FunctionBodyDecoderTest, MacrosStmt) {
   EXPECT_VERIFIES(v_i, WASM_SET_LOCAL(0, WASM_I32V_3(87348)));
   EXPECT_VERIFIES(
       v_i, WASM_STORE_MEM(MachineType::Int32(), WASM_I8(24), WASM_I8(40)));
   EXPECT_VERIFIES(v_i, WASM_IF(WASM_GET_LOCAL(0), WASM_NOP));
   EXPECT_VERIFIES(v_i, WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_NOP));
   EXPECT_VERIFIES(v_v, WASM_NOP);
   EXPECT_VERIFIES(v_v, B1(WASM_NOP));
@@ skipping 14 matching lines @@
 
 TEST_F(FunctionBodyDecoderTest, MacrosNestedBlocks) {
   EXPECT_VERIFIES(v_v, B2(WASM_NOP, B2(WASM_NOP, WASM_NOP)));
   EXPECT_VERIFIES(v_v, B3(WASM_NOP,                  // --
                           B2(WASM_NOP, WASM_NOP),    // --
                           B2(WASM_NOP, WASM_NOP)));  // --
   EXPECT_VERIFIES(v_v, B1(B1(B2(WASM_NOP, WASM_NOP))));
 }
 
 TEST_F(FunctionBodyDecoderTest, MultipleReturn) {
-  static LocalType kIntTypes5[] = {kAstI32, kAstI32, kAstI32, kAstI32, kAstI32};
+  static ValueType kIntTypes5[] = {kWasmI32, kWasmI32, kWasmI32, kWasmI32,
+                                   kWasmI32};
   FunctionSig sig_ii_v(2, 0, kIntTypes5);
   EXPECT_VERIFIES_S(&sig_ii_v, WASM_RETURNN(2, WASM_ZERO, WASM_ONE));
   EXPECT_FAILURE_S(&sig_ii_v, WASM_RETURNN(1, WASM_ZERO));
 
   FunctionSig sig_iii_v(3, 0, kIntTypes5);
   EXPECT_VERIFIES_S(&sig_iii_v,
                     WASM_RETURNN(3, WASM_ZERO, WASM_ONE, WASM_I8(44)));
   EXPECT_FAILURE_S(&sig_iii_v, WASM_RETURNN(2, WASM_ZERO, WASM_ONE));
 }
 
 TEST_F(FunctionBodyDecoderTest, MultipleReturn_fallthru) {
-  static LocalType kIntTypes5[] = {kAstI32, kAstI32, kAstI32, kAstI32, kAstI32};
+  static ValueType kIntTypes5[] = {kWasmI32, kWasmI32, kWasmI32, kWasmI32,
+                                   kWasmI32};
   FunctionSig sig_ii_v(2, 0, kIntTypes5);
 
   EXPECT_VERIFIES_S(&sig_ii_v, WASM_ZERO, WASM_ONE);
   EXPECT_FAILURE_S(&sig_ii_v, WASM_ZERO);
 
   FunctionSig sig_iii_v(3, 0, kIntTypes5);
   EXPECT_VERIFIES_S(&sig_iii_v, WASM_ZERO, WASM_ONE, WASM_I8(44));
   EXPECT_FAILURE_S(&sig_iii_v, WASM_ZERO, WASM_ONE);
 }
 
@@ skipping 163 matching lines @@
                   VARINT1(0x33));
   EXPECT_VERIFIES(v_i, WASM_ZERO, WASM_ZERO, kExprI32StoreMem, ZERO_ALIGNMENT,
                   VARINT2(0x1111));
   EXPECT_VERIFIES(v_i, WASM_ZERO, WASM_ZERO, kExprI32StoreMem, ZERO_ALIGNMENT,
                   VARINT3(0x222222));
   EXPECT_VERIFIES(v_i, WASM_ZERO, WASM_ZERO, kExprI32StoreMem, ZERO_ALIGNMENT,
                   VARINT4(0x44444444));
 }
 
 TEST_F(FunctionBodyDecoderTest, AllLoadMemCombinations) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType local_type = kLocalTypes[i];
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType local_type = kValueTypes[i];
     for (size_t j = 0; j < arraysize(machineTypes); j++) {
       MachineType mem_type = machineTypes[j];
       byte code[] = {WASM_LOAD_MEM(mem_type, WASM_ZERO)};
       FunctionSig sig(1, 0, &local_type);
-      if (local_type == WasmOpcodes::LocalTypeFor(mem_type)) {
+      if (local_type == WasmOpcodes::ValueTypeFor(mem_type)) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, AllStoreMemCombinations) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType local_type = kLocalTypes[i];
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType local_type = kValueTypes[i];
     for (size_t j = 0; j < arraysize(machineTypes); j++) {
       MachineType mem_type = machineTypes[j];
       byte code[] = {WASM_STORE_MEM(mem_type, WASM_ZERO, WASM_GET_LOCAL(0))};
       FunctionSig sig(0, 1, &local_type);
-      if (local_type == WasmOpcodes::LocalTypeFor(mem_type)) {
+      if (local_type == WasmOpcodes::ValueTypeFor(mem_type)) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 namespace {
 // A helper for tests that require a module environment for functions and
 // globals.
 class TestModuleEnv : public ModuleEnv {
  public:
   explicit TestModuleEnv(ModuleOrigin origin = kWasmOrigin)
       : ModuleEnv(&mod, nullptr) {
     mod.origin = origin;
   }
-  byte AddGlobal(LocalType type, bool mutability = true) {
+  byte AddGlobal(ValueType type, bool mutability = true) {
     mod.globals.push_back({type, mutability, WasmInitExpr(), 0, false, false});
     CHECK(mod.globals.size() <= 127);
     return static_cast<byte>(mod.globals.size() - 1);
   }
   byte AddSignature(FunctionSig* sig) {
     mod.signatures.push_back(sig);
     CHECK(mod.signatures.size() <= 127);
     return static_cast<byte>(mod.signatures.size() - 1);
   }
   byte AddFunction(FunctionSig* sig) {
@@ skipping 78 matching lines @@
 
   module_env.AddFunction(sigs.i_d());
 
   EXPECT_FAILURE_S(sig, WASM_CALL_FUNCTION(1, WASM_I8(16)));
   EXPECT_FAILURE_S(sig, WASM_CALL_FUNCTION(1, WASM_I64V_1(16)));
   EXPECT_FAILURE_S(sig, WASM_CALL_FUNCTION(1, WASM_F32(17.6)));
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiReturn) {
   FLAG_wasm_mv_prototype = true;
-  LocalType storage[] = {kAstI32, kAstI32};
+  ValueType storage[] = {kWasmI32, kWasmI32};
   FunctionSig sig_ii_v(2, 0, storage);
   FunctionSig sig_v_ii(0, 2, storage);
   TestModuleEnv module_env;
   module = &module_env;
 
   module_env.AddFunction(&sig_v_ii);
   module_env.AddFunction(&sig_ii_v);
 
   EXPECT_VERIFIES_S(&sig_ii_v, WASM_CALL_FUNCTION0(1));
   EXPECT_VERIFIES(v_v, WASM_CALL_FUNCTION0(1), WASM_DROP, WASM_DROP);
   EXPECT_VERIFIES(v_v, WASM_CALL_FUNCTION0(1), kExprCallFunction, 0);
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiReturnType) {
   FLAG_wasm_mv_prototype = true;
-  for (size_t a = 0; a < arraysize(kLocalTypes); a++) {
-    for (size_t b = 0; b < arraysize(kLocalTypes); b++) {
-      for (size_t c = 0; c < arraysize(kLocalTypes); c++) {
-        for (size_t d = 0; d < arraysize(kLocalTypes); d++) {
-          LocalType storage_ab[] = {kLocalTypes[a], kLocalTypes[b]};
+  for (size_t a = 0; a < arraysize(kValueTypes); a++) {
+    for (size_t b = 0; b < arraysize(kValueTypes); b++) {
+      for (size_t c = 0; c < arraysize(kValueTypes); c++) {
+        for (size_t d = 0; d < arraysize(kValueTypes); d++) {
+          ValueType storage_ab[] = {kValueTypes[a], kValueTypes[b]};
           FunctionSig sig_ab_v(2, 0, storage_ab);
-          LocalType storage_cd[] = {kLocalTypes[c], kLocalTypes[d]};
+          ValueType storage_cd[] = {kValueTypes[c], kValueTypes[d]};
           FunctionSig sig_cd_v(2, 0, storage_cd);
 
           TestModuleEnv module_env;
           module = &module_env;
           module_env.AddFunction(&sig_cd_v);
 
           EXPECT_VERIFIES_S(&sig_cd_v, WASM_CALL_FUNCTION0(0));
 
           if (a == c && b == d) {
             EXPECT_VERIFIES_S(&sig_ab_v, WASM_CALL_FUNCTION0(0));
@@ skipping 109 matching lines @@
   EXPECT_FAILURE_S(sig, WASM_CALL_FUNCTION(f1, WASM_I8(16)));
   EXPECT_FAILURE_S(sig, WASM_CALL_FUNCTION(f1, WASM_I64V_1(16)));
   EXPECT_FAILURE_S(sig, WASM_CALL_FUNCTION(f1, WASM_F32(17.6)));
 }
 
 TEST_F(FunctionBodyDecoderTest, Int32Globals) {
   FunctionSig* sig = sigs.i_i();
   TestModuleEnv module_env;
   module = &module_env;
 
-  module_env.AddGlobal(kAstI32);
+  module_env.AddGlobal(kWasmI32);
 
   EXPECT_VERIFIES_S(sig, WASM_GET_GLOBAL(0));
   EXPECT_FAILURE_S(sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)));
   EXPECT_VERIFIES_S(sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_ZERO);
 }
 
 TEST_F(FunctionBodyDecoderTest, ImmutableGlobal) {
   FunctionSig* sig = sigs.v_v();
   TestModuleEnv module_env;
   module = &module_env;
 
-  uint32_t g0 = module_env.AddGlobal(kAstI32, true);
-  uint32_t g1 = module_env.AddGlobal(kAstI32, false);
+  uint32_t g0 = module_env.AddGlobal(kWasmI32, true);
+  uint32_t g1 = module_env.AddGlobal(kWasmI32, false);
 
   EXPECT_VERIFIES_S(sig, WASM_SET_GLOBAL(g0, WASM_ZERO));
   EXPECT_FAILURE_S(sig, WASM_SET_GLOBAL(g1, WASM_ZERO));
 }
 
 TEST_F(FunctionBodyDecoderTest, Int32Globals_fail) {
   FunctionSig* sig = sigs.i_i();
   TestModuleEnv module_env;
   module = &module_env;
 
-  module_env.AddGlobal(kAstI64);
-  module_env.AddGlobal(kAstI64);
-  module_env.AddGlobal(kAstF32);
-  module_env.AddGlobal(kAstF64);
+  module_env.AddGlobal(kWasmI64);
+  module_env.AddGlobal(kWasmI64);
+  module_env.AddGlobal(kWasmF32);
+  module_env.AddGlobal(kWasmF64);
 
   EXPECT_FAILURE_S(sig, WASM_GET_GLOBAL(0));
   EXPECT_FAILURE_S(sig, WASM_GET_GLOBAL(1));
   EXPECT_FAILURE_S(sig, WASM_GET_GLOBAL(2));
   EXPECT_FAILURE_S(sig, WASM_GET_GLOBAL(3));
 
   EXPECT_FAILURE_S(sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_ZERO);
   EXPECT_FAILURE_S(sig, WASM_SET_GLOBAL(1, WASM_GET_LOCAL(0)), WASM_ZERO);
   EXPECT_FAILURE_S(sig, WASM_SET_GLOBAL(2, WASM_GET_LOCAL(0)), WASM_ZERO);
   EXPECT_FAILURE_S(sig, WASM_SET_GLOBAL(3, WASM_GET_LOCAL(0)), WASM_ZERO);
 }
 
 TEST_F(FunctionBodyDecoderTest, Int64Globals) {
   FunctionSig* sig = sigs.l_l();
   TestModuleEnv module_env;
   module = &module_env;
 
-  module_env.AddGlobal(kAstI64);
-  module_env.AddGlobal(kAstI64);
+  module_env.AddGlobal(kWasmI64);
+  module_env.AddGlobal(kWasmI64);
 
   EXPECT_VERIFIES_S(sig, WASM_GET_GLOBAL(0));
   EXPECT_VERIFIES_S(sig, WASM_GET_GLOBAL(1));
 
   EXPECT_VERIFIES_S(sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)),
                     WASM_GET_LOCAL(0));
   EXPECT_VERIFIES_S(sig, WASM_SET_GLOBAL(1, WASM_GET_LOCAL(0)),
                     WASM_GET_LOCAL(0));
 }
 
 TEST_F(FunctionBodyDecoderTest, Float32Globals) {
   FunctionSig* sig = sigs.f_ff();
   TestModuleEnv module_env;
   module = &module_env;
 
-  module_env.AddGlobal(kAstF32);
+  module_env.AddGlobal(kWasmF32);
 
   EXPECT_VERIFIES_S(sig, WASM_GET_GLOBAL(0));
   EXPECT_VERIFIES_S(sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)),
                     WASM_GET_LOCAL(0));
 }
 
 TEST_F(FunctionBodyDecoderTest, Float64Globals) {
   FunctionSig* sig = sigs.d_dd();
   TestModuleEnv module_env;
   module = &module_env;
 
-  module_env.AddGlobal(kAstF64);
+  module_env.AddGlobal(kWasmF64);
 
   EXPECT_VERIFIES_S(sig, WASM_GET_GLOBAL(0));
   EXPECT_VERIFIES_S(sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)),
                     WASM_GET_LOCAL(0));
 }
 
 TEST_F(FunctionBodyDecoderTest, AllGetGlobalCombinations) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType local_type = kLocalTypes[i];
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType global_type = kLocalTypes[j];
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType local_type = kValueTypes[i];
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType global_type = kValueTypes[j];
       FunctionSig sig(1, 0, &local_type);
       TestModuleEnv module_env;
       module = &module_env;
       module_env.AddGlobal(global_type);
       if (local_type == global_type) {
         EXPECT_VERIFIES_S(&sig, WASM_GET_GLOBAL(0));
       } else {
         EXPECT_FAILURE_S(&sig, WASM_GET_GLOBAL(0));
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, AllSetGlobalCombinations) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType local_type = kLocalTypes[i];
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType global_type = kLocalTypes[j];
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType local_type = kValueTypes[i];
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType global_type = kValueTypes[j];
       FunctionSig sig(0, 1, &local_type);
       TestModuleEnv module_env;
       module = &module_env;
       module_env.AddGlobal(global_type);
       if (local_type == global_type) {
         EXPECT_VERIFIES_S(&sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)));
       } else {
         EXPECT_FAILURE_S(&sig, WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)));
       }
     }
@@ skipping 11 matching lines @@
 
 TEST_F(FunctionBodyDecoderTest, AsmJsGrowMemory) {
   TestModuleEnv module_env(kAsmJsOrigin);
   module = &module_env;
 
   byte code[] = {WASM_GET_LOCAL(0), kExprGrowMemory, 0};
   EXPECT_FAILURE_C(i_i, code);
 }
 
 TEST_F(FunctionBodyDecoderTest, AsmJsBinOpsCheckOrigin) {
-  LocalType float32int32float32[] = {kAstF32, kAstI32, kAstF32};
+  ValueType float32int32float32[] = {kWasmF32, kWasmI32, kWasmF32};
   FunctionSig sig_f_if(1, 2, float32int32float32);
-  LocalType float64int32float64[] = {kAstF64, kAstI32, kAstF64};
+  ValueType float64int32float64[] = {kWasmF64, kWasmI32, kWasmF64};
   FunctionSig sig_d_id(1, 2, float64int32float64);
   struct {
     WasmOpcode op;
     FunctionSig* sig;
   } AsmJsBinOps[] = {
       {kExprF64Atan2, sigs.d_dd()},
       {kExprF64Pow, sigs.d_dd()},
       {kExprF64Mod, sigs.d_dd()},
       {kExprI32AsmjsDivS, sigs.i_ii()},
       {kExprI32AsmjsDivU, sigs.i_ii()},
@@ skipping 19 matching lines @@
     module = &module_env;
     for (size_t i = 0; i < arraysize(AsmJsBinOps); i++) {
       byte code[] = {
           WASM_BINOP(AsmJsBinOps[i].op, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
       EXPECT_FAILURE_SC(AsmJsBinOps[i].sig, code);
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, AsmJsUnOpsCheckOrigin) {
-  LocalType float32int32[] = {kAstF32, kAstI32};
+  ValueType float32int32[] = {kWasmF32, kWasmI32};
   FunctionSig sig_f_i(1, 1, float32int32);
-  LocalType float64int32[] = {kAstF64, kAstI32};
+  ValueType float64int32[] = {kWasmF64, kWasmI32};
   FunctionSig sig_d_i(1, 1, float64int32);
   struct {
     WasmOpcode op;
     FunctionSig* sig;
   } AsmJsUnOps[] = {{kExprF64Acos, sigs.d_d()},
                     {kExprF64Asin, sigs.d_d()},
                     {kExprF64Atan, sigs.d_d()},
                     {kExprF64Cos, sigs.d_d()},
                     {kExprF64Sin, sigs.d_d()},
                     {kExprF64Tan, sigs.d_d()},
@@ skipping 147 matching lines @@
   EXPECT_FAILURE(i_i, WASM_BLOCK_I(WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_ZERO)),
                                    WASM_F32(1.2)));
 
   // unify f64 and f64 => OK
   EXPECT_VERIFIES(
       d_dd, WASM_BLOCK_D(WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_GET_LOCAL(0))),
                          WASM_F64(1.2)));
 }
 
 TEST_F(FunctionBodyDecoderTest, Break_TypeCheckAll1) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType storage[] = {kLocalTypes[i], kLocalTypes[i], kLocalTypes[j]};
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType storage[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_BLOCK_T(
           sig.GetReturn(), WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_GET_LOCAL(0))),
           WASM_GET_LOCAL(1))};
 
       if (i == j) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, Break_TypeCheckAll2) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType storage[] = {kLocalTypes[i], kLocalTypes[i], kLocalTypes[j]};
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType storage[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_IF_ELSE_T(sig.GetReturn(0), WASM_ZERO,
                                     WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)),
                                     WASM_GET_LOCAL(1))};
 
       if (i == j) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, Break_TypeCheckAll3) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType storage[] = {kLocalTypes[i], kLocalTypes[i], kLocalTypes[j]};
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType storage[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_IF_ELSE_T(sig.GetReturn(), WASM_ZERO,
                                     WASM_GET_LOCAL(1),
                                     WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))};
 
       if (i == j) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, Break_Unify) {
   for (int which = 0; which < 2; which++) {
-    for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-      LocalType type = kLocalTypes[i];
-      LocalType storage[] = {kAstI32, kAstI32, type};
+    for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+      ValueType type = kValueTypes[i];
+      ValueType storage[] = {kWasmI32, kWasmI32, type};
       FunctionSig sig(1, 2, storage);
 
       byte code1[] = {WASM_BLOCK_T(
           type, WASM_IF(WASM_ZERO, WASM_BRV(1, WASM_GET_LOCAL(which))),
           WASM_GET_LOCAL(which ^ 1))};
 
-      if (type == kAstI32) {
+      if (type == kWasmI32) {
         EXPECT_VERIFIES_SC(&sig, code1);
       } else {
         EXPECT_FAILURE_SC(&sig, code1);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, BreakIf_cond_type) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType types[] = {kLocalTypes[i], kLocalTypes[i], kLocalTypes[j]};
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType types[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, types);
       byte code[] = {WASM_BLOCK_T(
           types[0], WASM_BRV_IF(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))};
 
-      if (types[2] == kAstI32) {
+      if (types[2] == kWasmI32) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, BreakIf_val_type) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    for (size_t j = 0; j < arraysize(kLocalTypes); j++) {
-      LocalType types[] = {kLocalTypes[i], kLocalTypes[i], kLocalTypes[j],
-                           kAstI32};
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    for (size_t j = 0; j < arraysize(kValueTypes); j++) {
+      ValueType types[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j],
+                           kWasmI32};
       FunctionSig sig(1, 3, types);
       byte code[] = {WASM_BLOCK_T(
           types[1], WASM_BRV_IF(0, WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
           WASM_DROP, WASM_GET_LOCAL(0))};
 
       if (i == j) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, BreakIf_Unify) {
   for (int which = 0; which < 2; which++) {
-    for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-      LocalType type = kLocalTypes[i];
-      LocalType storage[] = {kAstI32, kAstI32, type};
+    for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+      ValueType type = kValueTypes[i];
+      ValueType storage[] = {kWasmI32, kWasmI32, type};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(which)),
                                   WASM_DROP, WASM_GET_LOCAL(which ^ 1))};
 
-      if (type == kAstI32) {
+      if (type == kWasmI32) {
         EXPECT_VERIFIES_SC(&sig, code);
       } else {
         EXPECT_FAILURE_SC(&sig, code);
       }
     }
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, BrTable0) {
   static byte code[] = {kExprBrTable, 0, BR_TARGET(0)};
@@ skipping 111 matching lines @@
 TEST_F(FunctionBodyDecoderTest, Select_fail1) {
   EXPECT_FAILURE(
       i_i, WASM_SELECT(WASM_F32(0.0), WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
   EXPECT_FAILURE(
       i_i, WASM_SELECT(WASM_GET_LOCAL(0), WASM_F32(0.0), WASM_GET_LOCAL(0)));
   EXPECT_FAILURE(
       i_i, WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_F32(0.0)));
 }
 
 TEST_F(FunctionBodyDecoderTest, Select_fail2) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType type = kLocalTypes[i];
-    if (type == kAstI32) continue;
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType type = kValueTypes[i];
+    if (type == kWasmI32) continue;
 
-    LocalType types[] = {type, kAstI32, type};
+    ValueType types[] = {type, kWasmI32, type};
     FunctionSig sig(1, 2, types);
 
     EXPECT_VERIFIES_S(&sig, WASM_SELECT(WASM_GET_LOCAL(1), WASM_GET_LOCAL(1),
                                         WASM_GET_LOCAL(0)));
 
     EXPECT_FAILURE_S(&sig, WASM_SELECT(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0),
                                        WASM_GET_LOCAL(0)));
 
     EXPECT_FAILURE_S(&sig, WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
                                        WASM_GET_LOCAL(0)));
@@ skipping 36 matching lines @@
 
   // Missing end.
   EXPECT_FAILURE(v_i, WASM_TRY_OP, WASM_CATCH(0));
 
   // Double catch.
   EXPECT_FAILURE(v_i, WASM_TRY_OP, WASM_CATCH(0), WASM_CATCH(0), kExprEnd);
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValBlock1) {
   FLAG_wasm_mv_prototype = true;
-  EXPECT_VERIFIES(i_ii, WASM_BLOCK_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0),
+  EXPECT_VERIFIES(i_ii, WASM_BLOCK_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0),
                                       WASM_GET_LOCAL(1)),
                   kExprI32Add);
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValBlock2) {
   FLAG_wasm_mv_prototype = true;
-  EXPECT_VERIFIES(i_ii, WASM_BLOCK_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0),
+  EXPECT_VERIFIES(i_ii, WASM_BLOCK_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0),
                                       WASM_GET_LOCAL(1)),
                   WASM_I32_ADD(WASM_NOP, WASM_NOP));
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValBlockBr1) {
   FLAG_wasm_mv_prototype = true;
-  EXPECT_FAILURE(i_ii,
-                 WASM_BLOCK_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0), WASM_BR(0)),
-                 kExprI32Add);
-  EXPECT_VERIFIES(i_ii, WASM_BLOCK_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0),
+  EXPECT_FAILURE(
+      i_ii, WASM_BLOCK_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0), WASM_BR(0)),
+      kExprI32Add);
+  EXPECT_VERIFIES(i_ii, WASM_BLOCK_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0),
                                       WASM_GET_LOCAL(1), WASM_BR(0)),
                   kExprI32Add);
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValIf1) {
   FLAG_wasm_mv_prototype = true;
   EXPECT_FAILURE(
-      i_ii, WASM_IF_ELSE_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0),
+      i_ii, WASM_IF_ELSE_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0),
                             WASM_SEQ(WASM_GET_LOCAL(0)),
                             WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
       kExprI32Add);
   EXPECT_FAILURE(i_ii,
-                 WASM_IF_ELSE_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0),
+                 WASM_IF_ELSE_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0),
                                  WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
                                  WASM_SEQ(WASM_GET_LOCAL(1))),
                  kExprI32Add);
   EXPECT_VERIFIES(
-      i_ii, WASM_IF_ELSE_TT(kAstI32, kAstI32, WASM_GET_LOCAL(0),
+      i_ii, WASM_IF_ELSE_TT(kWasmI32, kWasmI32, WASM_GET_LOCAL(0),
                             WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
                             WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
       kExprI32Add);
 }
 
 class BranchTableIteratorTest : public TestWithZone {
  public:
   BranchTableIteratorTest() : TestWithZone() {}
   void CheckBrTableSize(const byte* start, const byte* end) {
     Decoder decoder(start, end);
@@ skipping 285 matching lines @@
   FOREACH_SIMD_0_OPERAND_OPCODE(TEST_SIMD)
 #undef TEST_SIMD
 #define TEST_SIMD(name, opcode, sig) \
   EXPECT_LENGTH_N(3, kSimdPrefix, static_cast<byte>(kExpr##name & 0xff));
   FOREACH_SIMD_1_OPERAND_OPCODE(TEST_SIMD)
 #undef TEST_SIMD
   // test for bad simd opcode
   EXPECT_LENGTH_N(2, kSimdPrefix, 0xff);
 }
 
-typedef ZoneVector<LocalType> LocalTypeMap;
+typedef ZoneVector<ValueType> ValueTypeMap;
 
 class LocalDeclDecoderTest : public TestWithZone {
  public:
   v8::internal::AccountingAllocator allocator;
 
-  size_t ExpectRun(LocalTypeMap map, size_t pos, LocalType expected,
+  size_t ExpectRun(ValueTypeMap map, size_t pos, ValueType expected,
                    size_t count) {
     for (size_t i = 0; i < count; i++) {
       EXPECT_EQ(expected, map[pos++]);
     }
     return pos;
   }
 
-  LocalTypeMap Expand(BodyLocalDecls& decls) {
-    ZoneVector<LocalType> map(zone());
+  ValueTypeMap Expand(BodyLocalDecls& decls) {
+    ZoneVector<ValueType> map(zone());
     for (auto p : decls.local_types) {
       map.insert(map.end(), p.second, p.first);
     }
     return map;
   }
 };
 
 TEST_F(LocalDeclDecoderTest, EmptyLocals) {
   BodyLocalDecls decls(zone());
   bool result = DecodeLocalDecls(decls, nullptr, nullptr);
   EXPECT_FALSE(result);
 }
 
 TEST_F(LocalDeclDecoderTest, NoLocals) {
   static const byte data[] = {0};
   BodyLocalDecls decls(zone());
   bool result = DecodeLocalDecls(decls, data, data + sizeof(data));
   EXPECT_TRUE(result);
   EXPECT_EQ(0u, decls.total_local_count);
 }
 
 TEST_F(LocalDeclDecoderTest, OneLocal) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType type = kLocalTypes[i];
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType type = kValueTypes[i];
     const byte data[] = {
-        1, 1, static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(type))};
+        1, 1, static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(type))};
     BodyLocalDecls decls(zone());
     bool result = DecodeLocalDecls(decls, data, data + sizeof(data));
     EXPECT_TRUE(result);
     EXPECT_EQ(1u, decls.total_local_count);
 
-    LocalTypeMap map = Expand(decls);
+    ValueTypeMap map = Expand(decls);
     EXPECT_EQ(1u, map.size());
     EXPECT_EQ(type, map[0]);
   }
 }
 
 TEST_F(LocalDeclDecoderTest, FiveLocals) {
-  for (size_t i = 0; i < arraysize(kLocalTypes); i++) {
-    LocalType type = kLocalTypes[i];
+  for (size_t i = 0; i < arraysize(kValueTypes); i++) {
+    ValueType type = kValueTypes[i];
     const byte data[] = {
-        1, 5, static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(type))};
+        1, 5, static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(type))};
     BodyLocalDecls decls(zone());
     bool result = DecodeLocalDecls(decls, data, data + sizeof(data));
     EXPECT_TRUE(result);
     EXPECT_EQ(sizeof(data), decls.decls_encoded_size);
     EXPECT_EQ(5u, decls.total_local_count);
 
-    LocalTypeMap map = Expand(decls);
+    ValueTypeMap map = Expand(decls);
     EXPECT_EQ(5u, map.size());
     ExpectRun(map, 0, type, 5);
   }
 }
 
 TEST_F(LocalDeclDecoderTest, MixedLocals) {
   for (byte a = 0; a < 3; a++) {
     for (byte b = 0; b < 3; b++) {
       for (byte c = 0; c < 3; c++) {
         for (byte d = 0; d < 3; d++) {
           const byte data[] = {4, a,         kLocalI32, b,        kLocalI64,
                                c, kLocalF32, d,         kLocalF64};
           BodyLocalDecls decls(zone());
           bool result = DecodeLocalDecls(decls, data, data + sizeof(data));
           EXPECT_TRUE(result);
           EXPECT_EQ(sizeof(data), decls.decls_encoded_size);
           EXPECT_EQ(static_cast<uint32_t>(a + b + c + d),
                     decls.total_local_count);
 
-          LocalTypeMap map = Expand(decls);
+          ValueTypeMap map = Expand(decls);
           EXPECT_EQ(static_cast<uint32_t>(a + b + c + d), map.size());
 
           size_t pos = 0;
-          pos = ExpectRun(map, pos, kAstI32, a);
-          pos = ExpectRun(map, pos, kAstI64, b);
-          pos = ExpectRun(map, pos, kAstF32, c);
-          pos = ExpectRun(map, pos, kAstF64, d);
+          pos = ExpectRun(map, pos, kWasmI32, a);
+          pos = ExpectRun(map, pos, kWasmI64, b);
+          pos = ExpectRun(map, pos, kWasmF32, c);
+          pos = ExpectRun(map, pos, kWasmF64, d);
         }
       }
     }
   }
 }
 
 TEST_F(LocalDeclDecoderTest, UseEncoder) {
   const byte* data = nullptr;
   const byte* end = nullptr;
   LocalDeclEncoder local_decls(zone());
 
-  local_decls.AddLocals(5, kAstF32);
-  local_decls.AddLocals(1337, kAstI32);
-  local_decls.AddLocals(212, kAstI64);
+  local_decls.AddLocals(5, kWasmF32);
+  local_decls.AddLocals(1337, kWasmI32);
+  local_decls.AddLocals(212, kWasmI64);
   local_decls.Prepend(zone(), &data, &end);
 
   BodyLocalDecls decls(zone());
   bool result = DecodeLocalDecls(decls, data, end);
   EXPECT_TRUE(result);
   EXPECT_EQ(5u + 1337u + 212u, decls.total_local_count);
 
-  LocalTypeMap map = Expand(decls);
+  ValueTypeMap map = Expand(decls);
   size_t pos = 0;
-  pos = ExpectRun(map, pos, kAstF32, 5);
-  pos = ExpectRun(map, pos, kAstI32, 1337);
-  pos = ExpectRun(map, pos, kAstI64, 212);
+  pos = ExpectRun(map, pos, kWasmF32, 5);
+  pos = ExpectRun(map, pos, kWasmI32, 1337);
+  pos = ExpectRun(map, pos, kWasmI64, 212);
 }
 
 class BytecodeIteratorTest : public TestWithZone {};
 
 TEST_F(BytecodeIteratorTest, SimpleForeach) {
   byte code[] = {WASM_IF_ELSE(WASM_ZERO, WASM_ZERO, WASM_ZERO)};
   BytecodeIterator iter(code, code + sizeof(code));
   WasmOpcode expected[] = {kExprI8Const, kExprIf,      kExprI8Const,
                            kExprElse,    kExprI8Const, kExprEnd};
   size_t pos = 0;
@@ skipping 59 matching lines @@
   iter.next();
   EXPECT_TRUE(iter.has_next());
   EXPECT_EQ(kExprI8Const, iter.current());
   iter.next();
   EXPECT_FALSE(iter.has_next());
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8