Skip to content

V
V8
Commit de252121 authored by Clemens Backes's avatar Clemens Backes Committed by V8 LUCI CQ
Browse files
Options

[wasm] Remove redundant inline annotations 

Functions defined inside a class declarations are inline by default.
Thus remove the 'inline' annotation from all such definitions.

Drive-by: Move the 'inline' annotation of
{WasmFunctionBuilder::signature} from the definition to the declaration.

R=jkummerow@chromium.org

Bug: v8:11384
Change-Id: I18be0b7d83c2414b3237e2f834e470c613143d7f
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2953320Reviewed-by: 's avatarJakob Kummerow <jkummerow@chromium.org>
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#75096}
parent 0e9f9aab
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 88 deletions
src/wasm/baseline/liftoff-assembler.h
View file @ de252121
...@@ -653,13 +653,13 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -653,13 +653,13 @@ class LiftoffAssembler : public TurboAssembler {
int32_t offset_imm, LiftoffRegister src, int32_t offset_imm, LiftoffRegister src,
LiftoffRegList pinned, LiftoffRegList pinned,
SkipWriteBarrier = kNoSkipWriteBarrier); SkipWriteBarrier = kNoSkipWriteBarrier);
inline void LoadFixedArrayLengthAsInt32(LiftoffRegister dst, Register array, void LoadFixedArrayLengthAsInt32(LiftoffRegister dst, Register array,
LiftoffRegList pinned) { LiftoffRegList pinned) {
int offset = FixedArray::kLengthOffset - kHeapObjectTag; int offset = FixedArray::kLengthOffset - kHeapObjectTag;
LoadSmiAsInt32(dst, array, offset, pinned); LoadSmiAsInt32(dst, array, offset, pinned);
} }
inline void LoadSmiAsInt32(LiftoffRegister dst, Register src_addr, void LoadSmiAsInt32(LiftoffRegister dst, Register src_addr, int32_t offset,
int32_t offset, LiftoffRegList pinned) { LiftoffRegList pinned) {
if (SmiValuesAre32Bits()) { if (SmiValuesAre32Bits()) {
#if V8_TARGET_LITTLE_ENDIAN #if V8_TARGET_LITTLE_ENDIAN
DCHECK_EQ(kSmiShiftSize + kSmiTagSize, 4 * kBitsPerByte); DCHECK_EQ(kSmiShiftSize + kSmiTagSize, 4 * kBitsPerByte);
...@@ -822,7 +822,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -822,7 +822,7 @@ class LiftoffAssembler : public TurboAssembler {
inline void emit_u32_to_intptr(Register dst, Register src); inline void emit_u32_to_intptr(Register dst, Register src);
inline void emit_ptrsize_add(Register dst, Register lhs, Register rhs) { void emit_ptrsize_add(Register dst, Register lhs, Register rhs) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_i64_add(LiftoffRegister(dst), LiftoffRegister(lhs), emit_i64_add(LiftoffRegister(dst), LiftoffRegister(lhs),
LiftoffRegister(rhs)); LiftoffRegister(rhs));
...@@ -830,7 +830,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -830,7 +830,7 @@ class LiftoffAssembler : public TurboAssembler {
emit_i32_add(dst, lhs, rhs); emit_i32_add(dst, lhs, rhs);
} }
} }
inline void emit_ptrsize_sub(Register dst, Register lhs, Register rhs) { void emit_ptrsize_sub(Register dst, Register lhs, Register rhs) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_i64_sub(LiftoffRegister(dst), LiftoffRegister(lhs), emit_i64_sub(LiftoffRegister(dst), LiftoffRegister(lhs),
LiftoffRegister(rhs)); LiftoffRegister(rhs));
...@@ -838,7 +838,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -838,7 +838,7 @@ class LiftoffAssembler : public TurboAssembler {
emit_i32_sub(dst, lhs, rhs); emit_i32_sub(dst, lhs, rhs);
} }
} }
inline void emit_ptrsize_and(Register dst, Register lhs, Register rhs) { void emit_ptrsize_and(Register dst, Register lhs, Register rhs) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_i64_and(LiftoffRegister(dst), LiftoffRegister(lhs), emit_i64_and(LiftoffRegister(dst), LiftoffRegister(lhs),
LiftoffRegister(rhs)); LiftoffRegister(rhs));
...@@ -846,7 +846,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -846,7 +846,7 @@ class LiftoffAssembler : public TurboAssembler {
emit_i32_and(dst, lhs, rhs); emit_i32_and(dst, lhs, rhs);
} }
} }
inline void emit_ptrsize_shri(Register dst, Register src, int amount) { void emit_ptrsize_shri(Register dst, Register src, int amount) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_i64_shri(LiftoffRegister(dst), LiftoffRegister(src), amount); emit_i64_shri(LiftoffRegister(dst), LiftoffRegister(src), amount);
} else { } else {
...@@ -854,7 +854,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -854,7 +854,7 @@ class LiftoffAssembler : public TurboAssembler {
} }
} }
inline void emit_ptrsize_addi(Register dst, Register lhs, intptr_t imm) { void emit_ptrsize_addi(Register dst, Register lhs, intptr_t imm) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_i64_addi(LiftoffRegister(dst), LiftoffRegister(lhs), imm); emit_i64_addi(LiftoffRegister(dst), LiftoffRegister(lhs), imm);
} else { } else {
...@@ -862,7 +862,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -862,7 +862,7 @@ class LiftoffAssembler : public TurboAssembler {
} }
} }
inline void emit_ptrsize_set_cond(LiftoffCondition condition, Register dst, void emit_ptrsize_set_cond(LiftoffCondition condition, Register dst,
LiftoffRegister lhs, LiftoffRegister rhs) { LiftoffRegister lhs, LiftoffRegister rhs) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_i64_set_cond(condition, dst, lhs, rhs); emit_i64_set_cond(condition, dst, lhs, rhs);
...@@ -871,7 +871,7 @@ class LiftoffAssembler : public TurboAssembler { ...@@ -871,7 +871,7 @@ class LiftoffAssembler : public TurboAssembler {
} }
} }
inline void emit_ptrsize_zeroextend_i32(Register dst, Register src) { void emit_ptrsize_zeroextend_i32(Register dst, Register src) {
if (kSystemPointerSize == 8) { if (kSystemPointerSize == 8) {
emit_type_conversion(kExprI64UConvertI32, LiftoffRegister(dst), emit_type_conversion(kExprI64UConvertI32, LiftoffRegister(dst),
LiftoffRegister(src)); LiftoffRegister(src));
......
src/wasm/function-body-decoder-impl.h
View file @ de252121
...@@ -422,7 +422,7 @@ template <Decoder::ValidateFlag validate> ...@@ -422,7 +422,7 @@ template <Decoder::ValidateFlag validate>
struct ImmI32Immediate { struct ImmI32Immediate {
int32_t value; int32_t value;
uint32_t length; uint32_t length;
inline ImmI32Immediate(Decoder* decoder, const byte* pc) { ImmI32Immediate(Decoder* decoder, const byte* pc) {
value = decoder->read_i32v<validate>(pc, &length, "immi32"); value = decoder->read_i32v<validate>(pc, &length, "immi32");
} }
}; };
...@@ -431,7 +431,7 @@ template <Decoder::ValidateFlag validate> ...@@ -431,7 +431,7 @@ template <Decoder::ValidateFlag validate>
struct ImmI64Immediate { struct ImmI64Immediate {
int64_t value; int64_t value;
uint32_t length; uint32_t length;
inline ImmI64Immediate(Decoder* decoder, const byte* pc) { ImmI64Immediate(Decoder* decoder, const byte* pc) {
value = decoder->read_i64v<validate>(pc, &length, "immi64"); value = decoder->read_i64v<validate>(pc, &length, "immi64");
} }
}; };
...@@ -440,7 +440,7 @@ template <Decoder::ValidateFlag validate> ...@@ -440,7 +440,7 @@ template <Decoder::ValidateFlag validate>
struct ImmF32Immediate { struct ImmF32Immediate {
float value; float value;
uint32_t length = 4; uint32_t length = 4;
inline ImmF32Immediate(Decoder* decoder, const byte* pc) { ImmF32Immediate(Decoder* decoder, const byte* pc) {
// We can't use bit_cast here because calling any helper function that // We can't use bit_cast here because calling any helper function that
// returns a float would potentially flip NaN bits per C++ semantics, so we // returns a float would potentially flip NaN bits per C++ semantics, so we
// have to inline the memcpy call directly. // have to inline the memcpy call directly.
...@@ -453,7 +453,7 @@ template <Decoder::ValidateFlag validate> ...@@ -453,7 +453,7 @@ template <Decoder::ValidateFlag validate>
struct ImmF64Immediate { struct ImmF64Immediate {
double value; double value;
uint32_t length = 8; uint32_t length = 8;
inline ImmF64Immediate(Decoder* decoder, const byte* pc) { ImmF64Immediate(Decoder* decoder, const byte* pc) {
// Avoid bit_cast because it might not preserve the signalling bit of a NaN. // Avoid bit_cast because it might not preserve the signalling bit of a NaN.
uint64_t tmp = decoder->read_u64<validate>(pc, "immf64"); uint64_t tmp = decoder->read_u64<validate>(pc, "immf64");
memcpy(&value, &tmp, sizeof(value)); memcpy(&value, &tmp, sizeof(value));
...@@ -465,7 +465,7 @@ template <Decoder::ValidateFlag validate> ...@@ -465,7 +465,7 @@ template <Decoder::ValidateFlag validate>
struct MemoryIndexImmediate { struct MemoryIndexImmediate {
uint8_t index = 0; uint8_t index = 0;
uint32_t length = 1; uint32_t length = 1;
inline MemoryIndexImmediate(Decoder* decoder, const byte* pc) { MemoryIndexImmediate(Decoder* decoder, const byte* pc) {
index = decoder->read_u8<validate>(pc, "memory index"); index = decoder->read_u8<validate>(pc, "memory index");
} }
}; };
...@@ -477,7 +477,7 @@ struct IndexImmediate { ...@@ -477,7 +477,7 @@ struct IndexImmediate {
uint32_t index; uint32_t index;
uint32_t length; uint32_t length;
inline IndexImmediate(Decoder* decoder, const byte* pc, const char* name) { IndexImmediate(Decoder* decoder, const byte* pc, const char* name) {
index = decoder->read_u32v<validate>(pc, &length, name); index = decoder->read_u32v<validate>(pc, &length, name);
} }
}; };
...@@ -526,7 +526,7 @@ struct SelectTypeImmediate { ...@@ -526,7 +526,7 @@ struct SelectTypeImmediate {
uint32_t length; uint32_t length;
ValueType type; ValueType type;
inline SelectTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, SelectTypeImmediate(const WasmFeatures& enabled, Decoder* decoder,
const byte* pc, const WasmModule* module) { const byte* pc, const WasmModule* module) {
uint8_t num_types = uint8_t num_types =
decoder->read_u32v<validate>(pc, &length, "number of select types"); decoder->read_u32v<validate>(pc, &length, "number of select types");
...@@ -550,7 +550,7 @@ struct BlockTypeImmediate { ...@@ -550,7 +550,7 @@ struct BlockTypeImmediate {
uint32_t sig_index = 0; uint32_t sig_index = 0;
const FunctionSig* sig = nullptr; const FunctionSig* sig = nullptr;
inline BlockTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, BlockTypeImmediate(const WasmFeatures& enabled, Decoder* decoder,
const byte* pc, const WasmModule* module) { const byte* pc, const WasmModule* module) {
int64_t block_type = int64_t block_type =
decoder->read_i33v<validate>(pc, &length, "block type"); decoder->read_i33v<validate>(pc, &length, "block type");
...@@ -597,7 +597,7 @@ template <Decoder::ValidateFlag validate> ...@@ -597,7 +597,7 @@ template <Decoder::ValidateFlag validate>
struct BranchDepthImmediate { struct BranchDepthImmediate {
uint32_t depth; uint32_t depth;
uint32_t length; uint32_t length;
inline BranchDepthImmediate(Decoder* decoder, const byte* pc) { BranchDepthImmediate(Decoder* decoder, const byte* pc) {
depth = decoder->read_u32v<validate>(pc, &length, "branch depth"); depth = decoder->read_u32v<validate>(pc, &length, "branch depth");
} }
}; };
...@@ -607,7 +607,7 @@ struct FieldImmediate { ...@@ -607,7 +607,7 @@ struct FieldImmediate {
StructIndexImmediate<validate> struct_imm; StructIndexImmediate<validate> struct_imm;
IndexImmediate<validate> field_imm; IndexImmediate<validate> field_imm;
uint32_t length; uint32_t length;
inline FieldImmediate(Decoder* decoder, const byte* pc) FieldImmediate(Decoder* decoder, const byte* pc)
: struct_imm(decoder, pc), : struct_imm(decoder, pc),
field_imm(decoder, pc + struct_imm.length, "field index"), field_imm(decoder, pc + struct_imm.length, "field index"),
length(struct_imm.length + field_imm.length) {} length(struct_imm.length + field_imm.length) {}
...@@ -619,7 +619,7 @@ struct CallIndirectImmediate { ...@@ -619,7 +619,7 @@ struct CallIndirectImmediate {
IndexImmediate<validate> table_imm; IndexImmediate<validate> table_imm;
uint32_t length; uint32_t length;
const FunctionSig* sig = nullptr; const FunctionSig* sig = nullptr;
inline CallIndirectImmediate(Decoder* decoder, const byte* pc) CallIndirectImmediate(Decoder* decoder, const byte* pc)
: sig_imm(decoder, pc, "singature index"), : sig_imm(decoder, pc, "singature index"),
table_imm(decoder, pc + sig_imm.length, "table index"), table_imm(decoder, pc + sig_imm.length, "table index"),
length(sig_imm.length + table_imm.length) {} length(sig_imm.length + table_imm.length) {}
...@@ -630,7 +630,7 @@ struct BranchTableImmediate { ...@@ -630,7 +630,7 @@ struct BranchTableImmediate {
uint32_t table_count; uint32_t table_count;
const byte* start; const byte* start;
const byte* table; const byte* table;
inline BranchTableImmediate(Decoder* decoder, const byte* pc) { BranchTableImmediate(Decoder* decoder, const byte* pc) {
start = pc; start = pc;
uint32_t len = 0; uint32_t len = 0;
table_count = decoder->read_u32v<validate>(pc, &len, "table count"); table_count = decoder->read_u32v<validate>(pc, &len, "table count");
...@@ -684,7 +684,7 @@ struct MemoryAccessImmediate { ...@@ -684,7 +684,7 @@ struct MemoryAccessImmediate {
uint32_t alignment; uint32_t alignment;
uint64_t offset; uint64_t offset;
uint32_t length = 0; uint32_t length = 0;
inline MemoryAccessImmediate(Decoder* decoder, const byte* pc, MemoryAccessImmediate(Decoder* decoder, const byte* pc,
uint32_t max_alignment, bool is_memory64) { uint32_t max_alignment, bool is_memory64) {
uint32_t alignment_length; uint32_t alignment_length;
alignment = alignment =
...@@ -714,7 +714,7 @@ struct SimdLaneImmediate { ...@@ -714,7 +714,7 @@ struct SimdLaneImmediate {
uint8_t lane; uint8_t lane;
uint32_t length = 1; uint32_t length = 1;
inline SimdLaneImmediate(Decoder* decoder, const byte* pc) { SimdLaneImmediate(Decoder* decoder, const byte* pc) {
lane = decoder->read_u8<validate>(pc, "lane"); lane = decoder->read_u8<validate>(pc, "lane");
} }
}; };
...@@ -724,7 +724,7 @@ template <Decoder::ValidateFlag validate> ...@@ -724,7 +724,7 @@ template <Decoder::ValidateFlag validate>
struct Simd128Immediate { struct Simd128Immediate {
uint8_t value[kSimd128Size] = {0}; uint8_t value[kSimd128Size] = {0};
inline Simd128Immediate(Decoder* decoder, const byte* pc) { Simd128Immediate(Decoder* decoder, const byte* pc) {
for (uint32_t i = 0; i < kSimd128Size; ++i) { for (uint32_t i = 0; i < kSimd128Size; ++i) {
value[i] = decoder->read_u8<validate>(pc + i, "value"); value[i] = decoder->read_u8<validate>(pc + i, "value");
} }
...@@ -737,7 +737,7 @@ struct MemoryInitImmediate { ...@@ -737,7 +737,7 @@ struct MemoryInitImmediate {
MemoryIndexImmediate<validate> memory; MemoryIndexImmediate<validate> memory;
uint32_t length; uint32_t length;
inline MemoryInitImmediate(Decoder* decoder, const byte* pc) MemoryInitImmediate(Decoder* decoder, const byte* pc)
: data_segment(decoder, pc, "data segment index"), : data_segment(decoder, pc, "data segment index"),
memory(decoder, pc + data_segment.length), memory(decoder, pc + data_segment.length),
length(data_segment.length + memory.length) {} length(data_segment.length + memory.length) {}
...@@ -749,7 +749,7 @@ struct MemoryCopyImmediate { ...@@ -749,7 +749,7 @@ struct MemoryCopyImmediate {
MemoryIndexImmediate<validate> memory_dst; MemoryIndexImmediate<validate> memory_dst;
uint32_t length; uint32_t length;
inline MemoryCopyImmediate(Decoder* decoder, const byte* pc) MemoryCopyImmediate(Decoder* decoder, const byte* pc)
: memory_src(decoder, pc), : memory_src(decoder, pc),
memory_dst(decoder, pc + memory_src.length), memory_dst(decoder, pc + memory_src.length),
length(memory_src.length + memory_dst.length) {} length(memory_src.length + memory_dst.length) {}
...@@ -761,7 +761,7 @@ struct TableInitImmediate { ...@@ -761,7 +761,7 @@ struct TableInitImmediate {
IndexImmediate<validate> table; IndexImmediate<validate> table;
uint32_t length; uint32_t length;
inline TableInitImmediate(Decoder* decoder, const byte* pc) TableInitImmediate(Decoder* decoder, const byte* pc)
: element_segment(decoder, pc, "element segment index"), : element_segment(decoder, pc, "element segment index"),
table(decoder, pc + element_segment.length, "table index"), table(decoder, pc + element_segment.length, "table index"),
length(element_segment.length + table.length) {} length(element_segment.length + table.length) {}
...@@ -773,7 +773,7 @@ struct TableCopyImmediate { ...@@ -773,7 +773,7 @@ struct TableCopyImmediate {
IndexImmediate<validate> table_src; IndexImmediate<validate> table_src;
uint32_t length; uint32_t length;
inline TableCopyImmediate(Decoder* decoder, const byte* pc) TableCopyImmediate(Decoder* decoder, const byte* pc)
: table_dst(decoder, pc, "table index"), : table_dst(decoder, pc, "table index"),
table_src(decoder, pc + table_dst.length, "table index"), table_src(decoder, pc + table_dst.length, "table index"),
length(table_src.length + table_dst.length) {} length(table_src.length + table_dst.length) {}
...@@ -783,7 +783,7 @@ template <Decoder::ValidateFlag validate> ...@@ -783,7 +783,7 @@ template <Decoder::ValidateFlag validate>
struct HeapTypeImmediate { struct HeapTypeImmediate {
uint32_t length = 1; uint32_t length = 1;
HeapType type; HeapType type;
inline HeapTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, HeapTypeImmediate(const WasmFeatures& enabled, Decoder* decoder,
const byte* pc, const WasmModule* module) const byte* pc, const WasmModule* module)
: type(value_type_reader::read_heap_type<validate>(decoder, pc, &length, : type(value_type_reader::read_heap_type<validate>(decoder, pc, &length,
module, enabled)) {} module, enabled)) {}
...@@ -911,7 +911,7 @@ struct ControlBase : public PcForErrors<validate> { ...@@ -911,7 +911,7 @@ struct ControlBase : public PcForErrors<validate> {
is_try_unwind(); is_try_unwind();
} }
inline Merge<Value>* br_merge() { Merge<Value>* br_merge() {
return is_loop() ? &this->start_merge : &this->end_merge; return is_loop() ? &this->start_merge : &this->end_merge;
} }
}; };
...@@ -1249,7 +1249,7 @@ class WasmDecoder : public Decoder { ...@@ -1249,7 +1249,7 @@ class WasmDecoder : public Decoder {
return VALIDATE(decoder->ok()) ? assigned : nullptr; return VALIDATE(decoder->ok()) ? assigned : nullptr;
} }
inline bool Validate(const byte* pc, ExceptionIndexImmediate<validate>& imm) { bool Validate(const byte* pc, ExceptionIndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->exceptions.size())) { if (!VALIDATE(imm.index < module_->exceptions.size())) {
DecodeError(pc, "Invalid exception index: %u", imm.index); DecodeError(pc, "Invalid exception index: %u", imm.index);
return false; return false;
...@@ -1258,7 +1258,7 @@ class WasmDecoder : public Decoder { ...@@ -1258,7 +1258,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, GlobalIndexImmediate<validate>& imm) { bool Validate(const byte* pc, GlobalIndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->globals.size())) { if (!VALIDATE(imm.index < module_->globals.size())) {
DecodeError(pc, "invalid global index: %u", imm.index); DecodeError(pc, "invalid global index: %u", imm.index);
return false; return false;
...@@ -1267,7 +1267,7 @@ class WasmDecoder : public Decoder { ...@@ -1267,7 +1267,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, StructIndexImmediate<validate>& imm) { bool Validate(const byte* pc, StructIndexImmediate<validate>& imm) {
if (!VALIDATE(module_->has_struct(imm.index))) { if (!VALIDATE(module_->has_struct(imm.index))) {
DecodeError(pc, "invalid struct index: %u", imm.index); DecodeError(pc, "invalid struct index: %u", imm.index);
return false; return false;
...@@ -1276,7 +1276,7 @@ class WasmDecoder : public Decoder { ...@@ -1276,7 +1276,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, FieldImmediate<validate>& imm) { bool Validate(const byte* pc, FieldImmediate<validate>& imm) {
if (!Validate(pc, imm.struct_imm)) return false; if (!Validate(pc, imm.struct_imm)) return false;
if (!VALIDATE(imm.field_imm.index < if (!VALIDATE(imm.field_imm.index <
imm.struct_imm.struct_type->field_count())) { imm.struct_imm.struct_type->field_count())) {
...@@ -1287,7 +1287,7 @@ class WasmDecoder : public Decoder { ...@@ -1287,7 +1287,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, ArrayIndexImmediate<validate>& imm) { bool Validate(const byte* pc, ArrayIndexImmediate<validate>& imm) {
if (!VALIDATE(module_->has_array(imm.index))) { if (!VALIDATE(module_->has_array(imm.index))) {
DecodeError(pc, "invalid array index: %u", imm.index); DecodeError(pc, "invalid array index: %u", imm.index);
return false; return false;
...@@ -1296,7 +1296,7 @@ class WasmDecoder : public Decoder { ...@@ -1296,7 +1296,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool CanReturnCall(const FunctionSig* target_sig) { bool CanReturnCall(const FunctionSig* target_sig) {
if (target_sig == nullptr) return false; if (target_sig == nullptr) return false;
size_t num_returns = sig_->return_count(); size_t num_returns = sig_->return_count();
if (num_returns != target_sig->return_count()) return false; if (num_returns != target_sig->return_count()) return false;
...@@ -1306,7 +1306,7 @@ class WasmDecoder : public Decoder { ...@@ -1306,7 +1306,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, CallFunctionImmediate<validate>& imm) { bool Validate(const byte* pc, CallFunctionImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->functions.size())) { if (!VALIDATE(imm.index < module_->functions.size())) {
DecodeError(pc, "function index #%u is out of bounds", imm.index); DecodeError(pc, "function index #%u is out of bounds", imm.index);
return false; return false;
...@@ -1315,7 +1315,7 @@ class WasmDecoder : public Decoder { ...@@ -1315,7 +1315,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, CallIndirectImmediate<validate>& imm) { bool Validate(const byte* pc, CallIndirectImmediate<validate>& imm) {
if (!ValidateSignature(pc, imm.sig_imm)) return false; if (!ValidateSignature(pc, imm.sig_imm)) return false;
// call_indirect is not behind the reftypes feature, so we have to impose // call_indirect is not behind the reftypes feature, so we have to impose
// the older format if reftypes is not enabled. // the older format if reftypes is not enabled.
...@@ -1350,7 +1350,7 @@ class WasmDecoder : public Decoder { ...@@ -1350,7 +1350,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, BranchDepthImmediate<validate>& imm, bool Validate(const byte* pc, BranchDepthImmediate<validate>& imm,
size_t control_depth) { size_t control_depth) {
if (!VALIDATE(imm.depth < control_depth)) { if (!VALIDATE(imm.depth < control_depth)) {
DecodeError(pc, "invalid branch depth: %u", imm.depth); DecodeError(pc, "invalid branch depth: %u", imm.depth);
...@@ -1359,7 +1359,7 @@ class WasmDecoder : public Decoder { ...@@ -1359,7 +1359,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, BranchTableImmediate<validate>& imm, bool Validate(const byte* pc, BranchTableImmediate<validate>& imm,
size_t block_depth) { size_t block_depth) {
if (!VALIDATE(imm.table_count <= kV8MaxWasmFunctionBrTableSize)) { if (!VALIDATE(imm.table_count <= kV8MaxWasmFunctionBrTableSize)) {
DecodeError(pc, "invalid table count (> max br_table size): %u", DecodeError(pc, "invalid table count (> max br_table size): %u",
...@@ -1369,7 +1369,7 @@ class WasmDecoder : public Decoder { ...@@ -1369,7 +1369,7 @@ class WasmDecoder : public Decoder {
return checkAvailable(imm.table_count); return checkAvailable(imm.table_count);
} }
inline bool Validate(const byte* pc, WasmOpcode opcode, bool Validate(const byte* pc, WasmOpcode opcode,
SimdLaneImmediate<validate>& imm) { SimdLaneImmediate<validate>& imm) {
uint8_t num_lanes = 0; uint8_t num_lanes = 0;
switch (opcode) { switch (opcode) {
...@@ -1415,7 +1415,7 @@ class WasmDecoder : public Decoder { ...@@ -1415,7 +1415,7 @@ class WasmDecoder : public Decoder {
} }
} }
inline bool Validate(const byte* pc, Simd128Immediate<validate>& imm) { bool Validate(const byte* pc, Simd128Immediate<validate>& imm) {
uint8_t max_lane = 0; uint8_t max_lane = 0;
for (uint32_t i = 0; i < kSimd128Size; ++i) { for (uint32_t i = 0; i < kSimd128Size; ++i) {
max_lane = std::max(max_lane, imm.value[i]); max_lane = std::max(max_lane, imm.value[i]);
...@@ -1428,7 +1428,7 @@ class WasmDecoder : public Decoder { ...@@ -1428,7 +1428,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, BlockTypeImmediate<validate>& imm) { bool Validate(const byte* pc, BlockTypeImmediate<validate>& imm) {
if (imm.type != kWasmBottom) return true; if (imm.type != kWasmBottom) return true;
if (!VALIDATE(module_->has_signature(imm.sig_index))) { if (!VALIDATE(module_->has_signature(imm.sig_index))) {
DecodeError(pc, "block type index %u is not a signature definition", DecodeError(pc, "block type index %u is not a signature definition",
...@@ -1439,7 +1439,7 @@ class WasmDecoder : public Decoder { ...@@ -1439,7 +1439,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, MemoryIndexImmediate<validate>& imm) { bool Validate(const byte* pc, MemoryIndexImmediate<validate>& imm) {
if (!VALIDATE(this->module_->has_memory)) { if (!VALIDATE(this->module_->has_memory)) {
this->DecodeError(pc, "memory instruction with no memory"); this->DecodeError(pc, "memory instruction with no memory");
return false; return false;
...@@ -1451,7 +1451,7 @@ class WasmDecoder : public Decoder { ...@@ -1451,7 +1451,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, MemoryAccessImmediate<validate>& imm) { bool Validate(const byte* pc, MemoryAccessImmediate<validate>& imm) {
if (!VALIDATE(this->module_->has_memory)) { if (!VALIDATE(this->module_->has_memory)) {
this->DecodeError(pc, "memory instruction with no memory"); this->DecodeError(pc, "memory instruction with no memory");
return false; return false;
...@@ -1459,17 +1459,17 @@ class WasmDecoder : public Decoder { ...@@ -1459,17 +1459,17 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, MemoryInitImmediate<validate>& imm) { bool Validate(const byte* pc, MemoryInitImmediate<validate>& imm) {
return ValidateDataSegment(pc, imm.data_segment) && return ValidateDataSegment(pc, imm.data_segment) &&
Validate(pc + imm.data_segment.length, imm.memory); Validate(pc + imm.data_segment.length, imm.memory);
} }
inline bool Validate(const byte* pc, MemoryCopyImmediate<validate>& imm) { bool Validate(const byte* pc, MemoryCopyImmediate<validate>& imm) {
return Validate(pc, imm.memory_src) && return Validate(pc, imm.memory_src) &&
Validate(pc + imm.memory_src.length, imm.memory_dst); Validate(pc + imm.memory_src.length, imm.memory_dst);
} }
inline bool Validate(const byte* pc, TableInitImmediate<validate>& imm) { bool Validate(const byte* pc, TableInitImmediate<validate>& imm) {
if (!ValidateElementSegment(pc, imm.element_segment)) return false; if (!ValidateElementSegment(pc, imm.element_segment)) return false;
if (!ValidateTable(pc + imm.element_segment.length, imm.table)) { if (!ValidateTable(pc + imm.element_segment.length, imm.table)) {
return false; return false;
...@@ -1485,7 +1485,7 @@ class WasmDecoder : public Decoder { ...@@ -1485,7 +1485,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool Validate(const byte* pc, TableCopyImmediate<validate>& imm) { bool Validate(const byte* pc, TableCopyImmediate<validate>& imm) {
if (!ValidateTable(pc, imm.table_src)) return false; if (!ValidateTable(pc, imm.table_src)) return false;
if (!ValidateTable(pc + imm.table_src.length, imm.table_dst)) return false; if (!ValidateTable(pc + imm.table_src.length, imm.table_dst)) return false;
ValueType src_type = module_->tables[imm.table_src.index].type; ValueType src_type = module_->tables[imm.table_src.index].type;
...@@ -1500,7 +1500,7 @@ class WasmDecoder : public Decoder { ...@@ -1500,7 +1500,7 @@ class WasmDecoder : public Decoder {
// The following Validate* functions all validate an IndexImmediate, albeit // The following Validate* functions all validate an IndexImmediate, albeit
// differently according to context. // differently according to context.
inline bool ValidateTable(const byte* pc, IndexImmediate<validate>& imm) { bool ValidateTable(const byte* pc, IndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->tables.size())) { if (!VALIDATE(imm.index < module_->tables.size())) {
DecodeError(pc, "invalid table index: %u", imm.index); DecodeError(pc, "invalid table index: %u", imm.index);
return false; return false;
...@@ -1508,8 +1508,7 @@ class WasmDecoder : public Decoder { ...@@ -1508,8 +1508,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool ValidateElementSegment(const byte* pc, bool ValidateElementSegment(const byte* pc, IndexImmediate<validate>& imm) {
IndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->elem_segments.size())) { if (!VALIDATE(imm.index < module_->elem_segments.size())) {
DecodeError(pc, "invalid element segment index: %u", imm.index); DecodeError(pc, "invalid element segment index: %u", imm.index);
return false; return false;
...@@ -1517,7 +1516,7 @@ class WasmDecoder : public Decoder { ...@@ -1517,7 +1516,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool ValidateLocal(const byte* pc, IndexImmediate<validate>& imm) { bool ValidateLocal(const byte* pc, IndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < num_locals())) { if (!VALIDATE(imm.index < num_locals())) {
DecodeError(pc, "invalid local index: %u", imm.index); DecodeError(pc, "invalid local index: %u", imm.index);
return false; return false;
...@@ -1525,7 +1524,7 @@ class WasmDecoder : public Decoder { ...@@ -1525,7 +1524,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool ValidateType(const byte* pc, IndexImmediate<validate>& imm) { bool ValidateType(const byte* pc, IndexImmediate<validate>& imm) {
if (!VALIDATE(module_->has_type(imm.index))) { if (!VALIDATE(module_->has_type(imm.index))) {
DecodeError(pc, "invalid type index: %u", imm.index); DecodeError(pc, "invalid type index: %u", imm.index);
return false; return false;
...@@ -1533,7 +1532,7 @@ class WasmDecoder : public Decoder { ...@@ -1533,7 +1532,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool ValidateSignature(const byte* pc, IndexImmediate<validate>& imm) { bool ValidateSignature(const byte* pc, IndexImmediate<validate>& imm) {
if (!VALIDATE(module_->has_signature(imm.index))) { if (!VALIDATE(module_->has_signature(imm.index))) {
DecodeError(pc, "invalid signature index: %u", imm.index); DecodeError(pc, "invalid signature index: %u", imm.index);
return false; return false;
...@@ -1541,7 +1540,7 @@ class WasmDecoder : public Decoder { ...@@ -1541,7 +1540,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool ValidateFunction(const byte* pc, IndexImmediate<validate>& imm) { bool ValidateFunction(const byte* pc, IndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->functions.size())) { if (!VALIDATE(imm.index < module_->functions.size())) {
DecodeError(pc, "function index #%u is out of bounds", imm.index); DecodeError(pc, "function index #%u is out of bounds", imm.index);
return false; return false;
...@@ -1553,8 +1552,7 @@ class WasmDecoder : public Decoder { ...@@ -1553,8 +1552,7 @@ class WasmDecoder : public Decoder {
return true; return true;
} }
inline bool ValidateDataSegment(const byte* pc, bool ValidateDataSegment(const byte* pc, IndexImmediate<validate>& imm) {
IndexImmediate<validate>& imm) {
if (!VALIDATE(imm.index < module_->num_declared_data_segments)) { if (!VALIDATE(imm.index < module_->num_declared_data_segments)) {
DecodeError(pc, "invalid data segment index: %u", imm.index); DecodeError(pc, "invalid data segment index: %u", imm.index);
return false; return false;
...@@ -2237,7 +2235,7 @@ class WasmFullDecoder : public WasmDecoder<validate> { ...@@ -2237,7 +2235,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
} }
} }
inline uint32_t pc_relative_offset() const { uint32_t pc_relative_offset() const {
return this->pc_offset() - first_instruction_offset; return this->pc_offset() - first_instruction_offset;
} }
......
src/wasm/function-body-decoder.h
View file @ de252121
...@@ -98,15 +98,15 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) { ...@@ -98,15 +98,15 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) {
// Base class for both iterators defined below. // Base class for both iterators defined below.
class iterator_base { class iterator_base {
public: public:
inline iterator_base& operator++() { iterator_base& operator++() {
DCHECK_LT(ptr_, end_); DCHECK_LT(ptr_, end_);
ptr_ += OpcodeLength(ptr_, end_); ptr_ += OpcodeLength(ptr_, end_);
return *this; return *this;
} }
inline bool operator==(const iterator_base& that) { bool operator==(const iterator_base& that) {
return this->ptr_ == that.ptr_; return this->ptr_ == that.ptr_;
} }
inline bool operator!=(const iterator_base& that) { bool operator!=(const iterator_base& that) {
return this->ptr_ != that.ptr_; return this->ptr_ != that.ptr_;
} }
...@@ -122,7 +122,7 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) { ...@@ -122,7 +122,7 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) {
: public iterator_base, : public iterator_base,
public base::iterator<std::input_iterator_tag, WasmOpcode> { public base::iterator<std::input_iterator_tag, WasmOpcode> {
public: public:
inline WasmOpcode operator*() { WasmOpcode operator*() {
DCHECK_LT(ptr_, end_); DCHECK_LT(ptr_, end_);
return static_cast<WasmOpcode>(*ptr_); return static_cast<WasmOpcode>(*ptr_);
} }
...@@ -138,7 +138,7 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) { ...@@ -138,7 +138,7 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) {
: public iterator_base, : public iterator_base,
public base::iterator<std::input_iterator_tag, uint32_t> { public base::iterator<std::input_iterator_tag, uint32_t> {
public: public:
inline uint32_t operator*() { uint32_t operator*() {
DCHECK_LT(ptr_, end_); DCHECK_LT(ptr_, end_);
return static_cast<uint32_t>(ptr_ - start_); return static_cast<uint32_t>(ptr_ - start_);
} }
......
src/wasm/leb-helper.h
View file @ de252121
...@@ -81,7 +81,7 @@ class LEBHelper { ...@@ -81,7 +81,7 @@ class LEBHelper {
// TODO(titzer): move core logic for decoding LEBs from decoder.h to here. // TODO(titzer): move core logic for decoding LEBs from decoder.h to here.
// Compute the size of {val} if emitted as an LEB32. // Compute the size of {val} if emitted as an LEB32.
static inline size_t sizeof_u32v(size_t val) { static size_t sizeof_u32v(size_t val) {
size_t size = 0; size_t size = 0;
do { do {
size++; size++;
...@@ -91,7 +91,7 @@ class LEBHelper { ...@@ -91,7 +91,7 @@ class LEBHelper {
} }
// Compute the size of {val} if emitted as an LEB32. // Compute the size of {val} if emitted as an LEB32.
static inline size_t sizeof_i32v(int32_t val) { static size_t sizeof_i32v(int32_t val) {
size_t size = 1; size_t size = 1;
if (val >= 0) { if (val >= 0) {
while (val >= 0x40) { // prevent sign extension. while (val >= 0x40) { // prevent sign extension.
...@@ -108,7 +108,7 @@ class LEBHelper { ...@@ -108,7 +108,7 @@ class LEBHelper {
} }
// Compute the size of {val} if emitted as an unsigned LEB64. // Compute the size of {val} if emitted as an unsigned LEB64.
static inline size_t sizeof_u64v(uint64_t val) { static size_t sizeof_u64v(uint64_t val) {
size_t size = 0; size_t size = 0;
do { do {
size++; size++;
...@@ -118,7 +118,7 @@ class LEBHelper { ...@@ -118,7 +118,7 @@ class LEBHelper {
} }
// Compute the size of {val} if emitted as a signed LEB64. // Compute the size of {val} if emitted as a signed LEB64.
static inline size_t sizeof_i64v(int64_t val) { static size_t sizeof_i64v(int64_t val) {
size_t size = 1; size_t size = 1;
if (val >= 0) { if (val >= 0) {
while (val >= 0x40) { // prevent sign extension. while (val >= 0x40) { // prevent sign extension.
......
src/wasm/module-decoder.cc
View file @ de252121
...@@ -174,27 +174,27 @@ class WasmSectionIterator { ...@@ -174,27 +174,27 @@ class WasmSectionIterator {
next(); next();
} }
inline bool more() const { return decoder_->ok() && decoder_->more(); } bool more() const { return decoder_->ok() && decoder_->more(); }
inline SectionCode section_code() const { return section_code_; } SectionCode section_code() const { return section_code_; }
inline const byte* section_start() const { return section_start_; } const byte* section_start() const { return section_start_; }
inline uint32_t section_length() const { uint32_t section_length() const {
return static_cast<uint32_t>(section_end_ - section_start_); return static_cast<uint32_t>(section_end_ - section_start_);
} }
inline Vector<const uint8_t> payload() const { Vector<const uint8_t> payload() const {
return {payload_start_, payload_length()}; return {payload_start_, payload_length()};
} }
inline const byte* payload_start() const { return payload_start_; } const byte* payload_start() const { return payload_start_; }
inline uint32_t payload_length() const { uint32_t payload_length() const {
return static_cast<uint32_t>(section_end_ - payload_start_); return static_cast<uint32_t>(section_end_ - payload_start_);
} }
inline const byte* section_end() const { return section_end_; } const byte* section_end() const { return section_end_; }
// Advances to the next section, checking that decoding the current section // Advances to the next section, checking that decoding the current section
// stopped at {section_end_}. // stopped at {section_end_}.
......
src/wasm/wasm-module-builder.h
View file @ de252121
...@@ -206,7 +206,7 @@ class V8_EXPORT_PRIVATE WasmFunctionBuilder : public ZoneObject { ...@@ -206,7 +206,7 @@ class V8_EXPORT_PRIVATE WasmFunctionBuilder : public ZoneObject {
WasmModuleBuilder* builder() const { return builder_; } WasmModuleBuilder* builder() const { return builder_; }
uint32_t func_index() { return func_index_; } uint32_t func_index() { return func_index_; }
FunctionSig* signature(); inline FunctionSig* signature();
private: private:
explicit WasmFunctionBuilder(WasmModuleBuilder* builder); explicit WasmFunctionBuilder(WasmModuleBuilder* builder);
...@@ -383,7 +383,7 @@ class V8_EXPORT_PRIVATE WasmModuleBuilder : public ZoneObject { ...@@ -383,7 +383,7 @@ class V8_EXPORT_PRIVATE WasmModuleBuilder : public ZoneObject {
#endif #endif
}; };
inline FunctionSig* WasmFunctionBuilder::signature() { FunctionSig* WasmFunctionBuilder::signature() {
return builder_->types_[signature_index_].sig; return builder_->types_[signature_index_].sig;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment