From de252121e5eda67d86f0168607dff1a5b11c6086 Mon Sep 17 00:00:00 2001 From: Clemens Backes Date: Thu, 10 Jun 2021 16:55:37 +0200 Subject: [PATCH] [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/+/2953320 Reviewed-by: Jakob Kummerow Commit-Queue: Clemens Backes Cr-Commit-Position: refs/heads/master@{#75096} --- src/wasm/baseline/liftoff-assembler.h | 24 +++--- src/wasm/function-body-decoder-impl.h | 112 +++++++++++++------------- src/wasm/function-body-decoder.h | 10 +-- src/wasm/leb-helper.h | 8 +- src/wasm/module-decoder.cc | 16 ++-- src/wasm/wasm-module-builder.h | 4 +- 6 files changed, 86 insertions(+), 88 deletions(-) diff --git a/src/wasm/baseline/liftoff-assembler.h b/src/wasm/baseline/liftoff-assembler.h index ab82b4fec8..adfdcb32c5 100644 --- a/src/wasm/baseline/liftoff-assembler.h +++ b/src/wasm/baseline/liftoff-assembler.h @@ -653,13 +653,13 @@ class LiftoffAssembler : public TurboAssembler { int32_t offset_imm, LiftoffRegister src, LiftoffRegList pinned, SkipWriteBarrier = kNoSkipWriteBarrier); - inline void LoadFixedArrayLengthAsInt32(LiftoffRegister dst, Register array, - LiftoffRegList pinned) { + void LoadFixedArrayLengthAsInt32(LiftoffRegister dst, Register array, + LiftoffRegList pinned) { int offset = FixedArray::kLengthOffset - kHeapObjectTag; LoadSmiAsInt32(dst, array, offset, pinned); } - inline void LoadSmiAsInt32(LiftoffRegister dst, Register src_addr, - int32_t offset, LiftoffRegList pinned) { + void LoadSmiAsInt32(LiftoffRegister dst, Register src_addr, int32_t offset, + LiftoffRegList pinned) { if (SmiValuesAre32Bits()) { #if V8_TARGET_LITTLE_ENDIAN DCHECK_EQ(kSmiShiftSize + kSmiTagSize, 4 * kBitsPerByte); @@ -822,7 +822,7 @@ class LiftoffAssembler : public TurboAssembler { 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) { emit_i64_add(LiftoffRegister(dst), LiftoffRegister(lhs), LiftoffRegister(rhs)); @@ -830,7 +830,7 @@ class LiftoffAssembler : public TurboAssembler { 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) { emit_i64_sub(LiftoffRegister(dst), LiftoffRegister(lhs), LiftoffRegister(rhs)); @@ -838,7 +838,7 @@ class LiftoffAssembler : public TurboAssembler { 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) { emit_i64_and(LiftoffRegister(dst), LiftoffRegister(lhs), LiftoffRegister(rhs)); @@ -846,7 +846,7 @@ class LiftoffAssembler : public TurboAssembler { 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) { emit_i64_shri(LiftoffRegister(dst), LiftoffRegister(src), amount); } else { @@ -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) { emit_i64_addi(LiftoffRegister(dst), LiftoffRegister(lhs), imm); } else { @@ -862,8 +862,8 @@ class LiftoffAssembler : public TurboAssembler { } } - inline void emit_ptrsize_set_cond(LiftoffCondition condition, Register dst, - LiftoffRegister lhs, LiftoffRegister rhs) { + void emit_ptrsize_set_cond(LiftoffCondition condition, Register dst, + LiftoffRegister lhs, LiftoffRegister rhs) { if (kSystemPointerSize == 8) { emit_i64_set_cond(condition, dst, lhs, rhs); } else { @@ -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) { emit_type_conversion(kExprI64UConvertI32, LiftoffRegister(dst), LiftoffRegister(src)); diff --git a/src/wasm/function-body-decoder-impl.h b/src/wasm/function-body-decoder-impl.h index 15bc82f7ed..a48e6fed33 100644 --- a/src/wasm/function-body-decoder-impl.h +++ b/src/wasm/function-body-decoder-impl.h @@ -422,7 +422,7 @@ template struct ImmI32Immediate { int32_t value; uint32_t length; - inline ImmI32Immediate(Decoder* decoder, const byte* pc) { + ImmI32Immediate(Decoder* decoder, const byte* pc) { value = decoder->read_i32v(pc, &length, "immi32"); } }; @@ -431,7 +431,7 @@ template struct ImmI64Immediate { int64_t value; uint32_t length; - inline ImmI64Immediate(Decoder* decoder, const byte* pc) { + ImmI64Immediate(Decoder* decoder, const byte* pc) { value = decoder->read_i64v(pc, &length, "immi64"); } }; @@ -440,7 +440,7 @@ template struct ImmF32Immediate { float value; 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 // returns a float would potentially flip NaN bits per C++ semantics, so we // have to inline the memcpy call directly. @@ -453,7 +453,7 @@ template struct ImmF64Immediate { double value; 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. uint64_t tmp = decoder->read_u64(pc, "immf64"); memcpy(&value, &tmp, sizeof(value)); @@ -465,7 +465,7 @@ template struct MemoryIndexImmediate { uint8_t index = 0; uint32_t length = 1; - inline MemoryIndexImmediate(Decoder* decoder, const byte* pc) { + MemoryIndexImmediate(Decoder* decoder, const byte* pc) { index = decoder->read_u8(pc, "memory index"); } }; @@ -477,7 +477,7 @@ struct IndexImmediate { uint32_t index; 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(pc, &length, name); } }; @@ -526,8 +526,8 @@ struct SelectTypeImmediate { uint32_t length; ValueType type; - inline SelectTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, - const byte* pc, const WasmModule* module) { + SelectTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, + const byte* pc, const WasmModule* module) { uint8_t num_types = decoder->read_u32v(pc, &length, "number of select types"); if (!VALIDATE(num_types == 1)) { @@ -550,8 +550,8 @@ struct BlockTypeImmediate { uint32_t sig_index = 0; const FunctionSig* sig = nullptr; - inline BlockTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, - const byte* pc, const WasmModule* module) { + BlockTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, + const byte* pc, const WasmModule* module) { int64_t block_type = decoder->read_i33v(pc, &length, "block type"); if (block_type < 0) { @@ -597,7 +597,7 @@ template struct BranchDepthImmediate { uint32_t depth; uint32_t length; - inline BranchDepthImmediate(Decoder* decoder, const byte* pc) { + BranchDepthImmediate(Decoder* decoder, const byte* pc) { depth = decoder->read_u32v(pc, &length, "branch depth"); } }; @@ -607,7 +607,7 @@ struct FieldImmediate { StructIndexImmediate struct_imm; IndexImmediate field_imm; uint32_t length; - inline FieldImmediate(Decoder* decoder, const byte* pc) + FieldImmediate(Decoder* decoder, const byte* pc) : struct_imm(decoder, pc), field_imm(decoder, pc + struct_imm.length, "field index"), length(struct_imm.length + field_imm.length) {} @@ -619,7 +619,7 @@ struct CallIndirectImmediate { IndexImmediate table_imm; uint32_t length; const FunctionSig* sig = nullptr; - inline CallIndirectImmediate(Decoder* decoder, const byte* pc) + CallIndirectImmediate(Decoder* decoder, const byte* pc) : sig_imm(decoder, pc, "singature index"), table_imm(decoder, pc + sig_imm.length, "table index"), length(sig_imm.length + table_imm.length) {} @@ -630,7 +630,7 @@ struct BranchTableImmediate { uint32_t table_count; const byte* start; const byte* table; - inline BranchTableImmediate(Decoder* decoder, const byte* pc) { + BranchTableImmediate(Decoder* decoder, const byte* pc) { start = pc; uint32_t len = 0; table_count = decoder->read_u32v(pc, &len, "table count"); @@ -684,8 +684,8 @@ struct MemoryAccessImmediate { uint32_t alignment; uint64_t offset; uint32_t length = 0; - inline MemoryAccessImmediate(Decoder* decoder, const byte* pc, - uint32_t max_alignment, bool is_memory64) { + MemoryAccessImmediate(Decoder* decoder, const byte* pc, + uint32_t max_alignment, bool is_memory64) { uint32_t alignment_length; alignment = decoder->read_u32v(pc, &alignment_length, "alignment"); @@ -714,7 +714,7 @@ struct SimdLaneImmediate { uint8_t lane; uint32_t length = 1; - inline SimdLaneImmediate(Decoder* decoder, const byte* pc) { + SimdLaneImmediate(Decoder* decoder, const byte* pc) { lane = decoder->read_u8(pc, "lane"); } }; @@ -724,7 +724,7 @@ template struct Simd128Immediate { 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) { value[i] = decoder->read_u8(pc + i, "value"); } @@ -737,7 +737,7 @@ struct MemoryInitImmediate { MemoryIndexImmediate memory; uint32_t length; - inline MemoryInitImmediate(Decoder* decoder, const byte* pc) + MemoryInitImmediate(Decoder* decoder, const byte* pc) : data_segment(decoder, pc, "data segment index"), memory(decoder, pc + data_segment.length), length(data_segment.length + memory.length) {} @@ -749,7 +749,7 @@ struct MemoryCopyImmediate { MemoryIndexImmediate memory_dst; uint32_t length; - inline MemoryCopyImmediate(Decoder* decoder, const byte* pc) + MemoryCopyImmediate(Decoder* decoder, const byte* pc) : memory_src(decoder, pc), memory_dst(decoder, pc + memory_src.length), length(memory_src.length + memory_dst.length) {} @@ -761,7 +761,7 @@ struct TableInitImmediate { IndexImmediate table; uint32_t length; - inline TableInitImmediate(Decoder* decoder, const byte* pc) + TableInitImmediate(Decoder* decoder, const byte* pc) : element_segment(decoder, pc, "element segment index"), table(decoder, pc + element_segment.length, "table index"), length(element_segment.length + table.length) {} @@ -773,7 +773,7 @@ struct TableCopyImmediate { IndexImmediate table_src; uint32_t length; - inline TableCopyImmediate(Decoder* decoder, const byte* pc) + TableCopyImmediate(Decoder* decoder, const byte* pc) : table_dst(decoder, pc, "table index"), table_src(decoder, pc + table_dst.length, "table index"), length(table_src.length + table_dst.length) {} @@ -783,8 +783,8 @@ template struct HeapTypeImmediate { uint32_t length = 1; HeapType type; - inline HeapTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, - const byte* pc, const WasmModule* module) + HeapTypeImmediate(const WasmFeatures& enabled, Decoder* decoder, + const byte* pc, const WasmModule* module) : type(value_type_reader::read_heap_type(decoder, pc, &length, module, enabled)) {} }; @@ -911,7 +911,7 @@ struct ControlBase : public PcForErrors { is_try_unwind(); } - inline Merge* br_merge() { + Merge* br_merge() { return is_loop() ? &this->start_merge : &this->end_merge; } }; @@ -1249,7 +1249,7 @@ class WasmDecoder : public Decoder { return VALIDATE(decoder->ok()) ? assigned : nullptr; } - inline bool Validate(const byte* pc, ExceptionIndexImmediate& imm) { + bool Validate(const byte* pc, ExceptionIndexImmediate& imm) { if (!VALIDATE(imm.index < module_->exceptions.size())) { DecodeError(pc, "Invalid exception index: %u", imm.index); return false; @@ -1258,7 +1258,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, GlobalIndexImmediate& imm) { + bool Validate(const byte* pc, GlobalIndexImmediate& imm) { if (!VALIDATE(imm.index < module_->globals.size())) { DecodeError(pc, "invalid global index: %u", imm.index); return false; @@ -1267,7 +1267,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, StructIndexImmediate& imm) { + bool Validate(const byte* pc, StructIndexImmediate& imm) { if (!VALIDATE(module_->has_struct(imm.index))) { DecodeError(pc, "invalid struct index: %u", imm.index); return false; @@ -1276,7 +1276,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, FieldImmediate& imm) { + bool Validate(const byte* pc, FieldImmediate& imm) { if (!Validate(pc, imm.struct_imm)) return false; if (!VALIDATE(imm.field_imm.index < imm.struct_imm.struct_type->field_count())) { @@ -1287,7 +1287,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, ArrayIndexImmediate& imm) { + bool Validate(const byte* pc, ArrayIndexImmediate& imm) { if (!VALIDATE(module_->has_array(imm.index))) { DecodeError(pc, "invalid array index: %u", imm.index); return false; @@ -1296,7 +1296,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool CanReturnCall(const FunctionSig* target_sig) { + bool CanReturnCall(const FunctionSig* target_sig) { if (target_sig == nullptr) return false; size_t num_returns = sig_->return_count(); if (num_returns != target_sig->return_count()) return false; @@ -1306,7 +1306,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, CallFunctionImmediate& imm) { + bool Validate(const byte* pc, CallFunctionImmediate& imm) { if (!VALIDATE(imm.index < module_->functions.size())) { DecodeError(pc, "function index #%u is out of bounds", imm.index); return false; @@ -1315,7 +1315,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, CallIndirectImmediate& imm) { + bool Validate(const byte* pc, CallIndirectImmediate& imm) { if (!ValidateSignature(pc, imm.sig_imm)) return false; // call_indirect is not behind the reftypes feature, so we have to impose // the older format if reftypes is not enabled. @@ -1350,8 +1350,8 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, BranchDepthImmediate& imm, - size_t control_depth) { + bool Validate(const byte* pc, BranchDepthImmediate& imm, + size_t control_depth) { if (!VALIDATE(imm.depth < control_depth)) { DecodeError(pc, "invalid branch depth: %u", imm.depth); return false; @@ -1359,8 +1359,8 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, BranchTableImmediate& imm, - size_t block_depth) { + bool Validate(const byte* pc, BranchTableImmediate& imm, + size_t block_depth) { if (!VALIDATE(imm.table_count <= kV8MaxWasmFunctionBrTableSize)) { DecodeError(pc, "invalid table count (> max br_table size): %u", imm.table_count); @@ -1369,8 +1369,8 @@ class WasmDecoder : public Decoder { return checkAvailable(imm.table_count); } - inline bool Validate(const byte* pc, WasmOpcode opcode, - SimdLaneImmediate& imm) { + bool Validate(const byte* pc, WasmOpcode opcode, + SimdLaneImmediate& imm) { uint8_t num_lanes = 0; switch (opcode) { case kExprF64x2ExtractLane: @@ -1415,7 +1415,7 @@ class WasmDecoder : public Decoder { } } - inline bool Validate(const byte* pc, Simd128Immediate& imm) { + bool Validate(const byte* pc, Simd128Immediate& imm) { uint8_t max_lane = 0; for (uint32_t i = 0; i < kSimd128Size; ++i) { max_lane = std::max(max_lane, imm.value[i]); @@ -1428,7 +1428,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, BlockTypeImmediate& imm) { + bool Validate(const byte* pc, BlockTypeImmediate& imm) { if (imm.type != kWasmBottom) return true; if (!VALIDATE(module_->has_signature(imm.sig_index))) { DecodeError(pc, "block type index %u is not a signature definition", @@ -1439,7 +1439,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, MemoryIndexImmediate& imm) { + bool Validate(const byte* pc, MemoryIndexImmediate& imm) { if (!VALIDATE(this->module_->has_memory)) { this->DecodeError(pc, "memory instruction with no memory"); return false; @@ -1451,7 +1451,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, MemoryAccessImmediate& imm) { + bool Validate(const byte* pc, MemoryAccessImmediate& imm) { if (!VALIDATE(this->module_->has_memory)) { this->DecodeError(pc, "memory instruction with no memory"); return false; @@ -1459,17 +1459,17 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, MemoryInitImmediate& imm) { + bool Validate(const byte* pc, MemoryInitImmediate& imm) { return ValidateDataSegment(pc, imm.data_segment) && Validate(pc + imm.data_segment.length, imm.memory); } - inline bool Validate(const byte* pc, MemoryCopyImmediate& imm) { + bool Validate(const byte* pc, MemoryCopyImmediate& imm) { return Validate(pc, imm.memory_src) && Validate(pc + imm.memory_src.length, imm.memory_dst); } - inline bool Validate(const byte* pc, TableInitImmediate& imm) { + bool Validate(const byte* pc, TableInitImmediate& imm) { if (!ValidateElementSegment(pc, imm.element_segment)) return false; if (!ValidateTable(pc + imm.element_segment.length, imm.table)) { return false; @@ -1485,7 +1485,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool Validate(const byte* pc, TableCopyImmediate& imm) { + bool Validate(const byte* pc, TableCopyImmediate& imm) { if (!ValidateTable(pc, imm.table_src)) return false; if (!ValidateTable(pc + imm.table_src.length, imm.table_dst)) return false; ValueType src_type = module_->tables[imm.table_src.index].type; @@ -1500,7 +1500,7 @@ class WasmDecoder : public Decoder { // The following Validate* functions all validate an IndexImmediate, albeit // differently according to context. - inline bool ValidateTable(const byte* pc, IndexImmediate& imm) { + bool ValidateTable(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(imm.index < module_->tables.size())) { DecodeError(pc, "invalid table index: %u", imm.index); return false; @@ -1508,8 +1508,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool ValidateElementSegment(const byte* pc, - IndexImmediate& imm) { + bool ValidateElementSegment(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(imm.index < module_->elem_segments.size())) { DecodeError(pc, "invalid element segment index: %u", imm.index); return false; @@ -1517,7 +1516,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool ValidateLocal(const byte* pc, IndexImmediate& imm) { + bool ValidateLocal(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(imm.index < num_locals())) { DecodeError(pc, "invalid local index: %u", imm.index); return false; @@ -1525,7 +1524,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool ValidateType(const byte* pc, IndexImmediate& imm) { + bool ValidateType(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(module_->has_type(imm.index))) { DecodeError(pc, "invalid type index: %u", imm.index); return false; @@ -1533,7 +1532,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool ValidateSignature(const byte* pc, IndexImmediate& imm) { + bool ValidateSignature(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(module_->has_signature(imm.index))) { DecodeError(pc, "invalid signature index: %u", imm.index); return false; @@ -1541,7 +1540,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool ValidateFunction(const byte* pc, IndexImmediate& imm) { + bool ValidateFunction(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(imm.index < module_->functions.size())) { DecodeError(pc, "function index #%u is out of bounds", imm.index); return false; @@ -1553,8 +1552,7 @@ class WasmDecoder : public Decoder { return true; } - inline bool ValidateDataSegment(const byte* pc, - IndexImmediate& imm) { + bool ValidateDataSegment(const byte* pc, IndexImmediate& imm) { if (!VALIDATE(imm.index < module_->num_declared_data_segments)) { DecodeError(pc, "invalid data segment index: %u", imm.index); return false; @@ -2237,7 +2235,7 @@ class WasmFullDecoder : public WasmDecoder { } } - inline uint32_t pc_relative_offset() const { + uint32_t pc_relative_offset() const { return this->pc_offset() - first_instruction_offset; } diff --git a/src/wasm/function-body-decoder.h b/src/wasm/function-body-decoder.h index b1e1cebe2f..f0451a3cf2 100644 --- a/src/wasm/function-body-decoder.h +++ b/src/wasm/function-body-decoder.h @@ -98,15 +98,15 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) { // Base class for both iterators defined below. class iterator_base { public: - inline iterator_base& operator++() { + iterator_base& operator++() { DCHECK_LT(ptr_, end_); ptr_ += OpcodeLength(ptr_, end_); return *this; } - inline bool operator==(const iterator_base& that) { + bool operator==(const iterator_base& that) { return this->ptr_ == that.ptr_; } - inline bool operator!=(const iterator_base& that) { + bool operator!=(const iterator_base& that) { return this->ptr_ != that.ptr_; } @@ -122,7 +122,7 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) { : public iterator_base, public base::iterator { public: - inline WasmOpcode operator*() { + WasmOpcode operator*() { DCHECK_LT(ptr_, end_); return static_cast(*ptr_); } @@ -138,7 +138,7 @@ class V8_EXPORT_PRIVATE BytecodeIterator : public NON_EXPORTED_BASE(Decoder) { : public iterator_base, public base::iterator { public: - inline uint32_t operator*() { + uint32_t operator*() { DCHECK_LT(ptr_, end_); return static_cast(ptr_ - start_); } diff --git a/src/wasm/leb-helper.h b/src/wasm/leb-helper.h index f3737600df..5327b1e32d 100644 --- a/src/wasm/leb-helper.h +++ b/src/wasm/leb-helper.h @@ -81,7 +81,7 @@ class LEBHelper { // TODO(titzer): move core logic for decoding LEBs from decoder.h to here. // 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; do { size++; @@ -91,7 +91,7 @@ class LEBHelper { } // 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; if (val >= 0) { while (val >= 0x40) { // prevent sign extension. @@ -108,7 +108,7 @@ class LEBHelper { } // 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; do { size++; @@ -118,7 +118,7 @@ class LEBHelper { } // 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; if (val >= 0) { while (val >= 0x40) { // prevent sign extension. diff --git a/src/wasm/module-decoder.cc b/src/wasm/module-decoder.cc index 1bcdc8a2cb..0682cd0548 100644 --- a/src/wasm/module-decoder.cc +++ b/src/wasm/module-decoder.cc @@ -174,27 +174,27 @@ class WasmSectionIterator { 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(section_end_ - section_start_); } - inline Vector payload() const { + Vector payload() const { 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(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 // stopped at {section_end_}. diff --git a/src/wasm/wasm-module-builder.h b/src/wasm/wasm-module-builder.h index 3fdee54acd..a089e6b0c9 100644 --- a/src/wasm/wasm-module-builder.h +++ b/src/wasm/wasm-module-builder.h @@ -206,7 +206,7 @@ class V8_EXPORT_PRIVATE WasmFunctionBuilder : public ZoneObject { WasmModuleBuilder* builder() const { return builder_; } uint32_t func_index() { return func_index_; } - FunctionSig* signature(); + inline FunctionSig* signature(); private: explicit WasmFunctionBuilder(WasmModuleBuilder* builder); @@ -383,7 +383,7 @@ class V8_EXPORT_PRIVATE WasmModuleBuilder : public ZoneObject { #endif }; -inline FunctionSig* WasmFunctionBuilder::signature() { +FunctionSig* WasmFunctionBuilder::signature() { return builder_->types_[signature_index_].sig; }