Index: src/wasm/wasm-macro-gen.h |
diff --git a/src/wasm/wasm-macro-gen.h b/src/wasm/wasm-macro-gen.h |
index eb1bdbc4dd6a40b9d8fa43b5e47bac20bd77f414..4cd2601c29d6b668c11a52cb0ea119f2562c61da 100644 |
--- a/src/wasm/wasm-macro-gen.h |
+++ b/src/wasm/wasm-macro-gen.h |
@@ -71,13 +71,13 @@ |
#define WASM_BLOCK(...) kExprBlock, kLocalVoid, __VA_ARGS__, kExprEnd |
#define WASM_BLOCK_T(t, ...) \ |
- kExprBlock, static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(t)), \ |
+ kExprBlock, static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(t)), \ |
__VA_ARGS__, kExprEnd |
#define WASM_BLOCK_TT(t1, t2, ...) \ |
kExprBlock, kMultivalBlock, 0, \ |
- static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(t1)), \ |
- static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(t2)), __VA_ARGS__, \ |
+ static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(t1)), \ |
+ static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(t2)), __VA_ARGS__, \ |
kExprEnd |
#define WASM_BLOCK_I(...) kExprBlock, kLocalI32, __VA_ARGS__, kExprEnd |
@@ -99,13 +99,13 @@ |
cond, kExprIf, kLocalVoid, tstmt, kExprElse, fstmt, kExprEnd |
#define WASM_IF_ELSE_T(t, cond, tstmt, fstmt) \ |
- cond, kExprIf, static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(t)), tstmt, \ |
+ cond, kExprIf, static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(t)), tstmt, \ |
kExprElse, fstmt, kExprEnd |
#define WASM_IF_ELSE_TT(t1, t2, cond, tstmt, fstmt) \ |
cond, kExprIf, kMultivalBlock, 0, \ |
- static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(t1)), \ |
- static_cast<byte>(WasmOpcodes::LocalTypeCodeFor(t2)), tstmt, kExprElse, \ |
+ static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(t1)), \ |
+ static_cast<byte>(WasmOpcodes::ValueTypeCodeFor(t2)), tstmt, kExprElse, \ |
fstmt, kExprEnd |
#define WASM_IF_ELSE_I(cond, tstmt, fstmt) \ |
@@ -195,7 +195,7 @@ class LocalDeclEncoder { |
pos = WriteUint32v(buffer, pos, static_cast<uint32_t>(local_decls.size())); |
for (size_t i = 0; i < local_decls.size(); ++i) { |
pos = WriteUint32v(buffer, pos, local_decls[i].first); |
- buffer[pos++] = WasmOpcodes::LocalTypeCodeFor(local_decls[i].second); |
+ buffer[pos++] = WasmOpcodes::ValueTypeCodeFor(local_decls[i].second); |
} |
DCHECK_EQ(Size(), pos); |
return pos; |
@@ -203,7 +203,7 @@ class LocalDeclEncoder { |
// Add locals declarations to this helper. Return the index of the newly added |
// local(s), with an optional adjustment for the parameters. |
- uint32_t AddLocals(uint32_t count, LocalType type) { |
+ uint32_t AddLocals(uint32_t count, ValueType type) { |
uint32_t result = |
static_cast<uint32_t>(total + (sig ? sig->parameter_count() : 0)); |
total += count; |
@@ -211,7 +211,7 @@ class LocalDeclEncoder { |
count += local_decls.back().first; |
local_decls.pop_back(); |
} |
- local_decls.push_back(std::pair<uint32_t, LocalType>(count, type)); |
+ local_decls.push_back(std::pair<uint32_t, ValueType>(count, type)); |
return result; |
} |
@@ -227,7 +227,7 @@ class LocalDeclEncoder { |
private: |
FunctionSig* sig; |
- ZoneVector<std::pair<uint32_t, LocalType>> local_decls; |
+ ZoneVector<std::pair<uint32_t, ValueType>> local_decls; |
size_t total; |
size_t SizeofUint32v(uint32_t val) const { |