Skip to content

Mark InstructionVisitor as ~Copyable #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kateinoigakukun merged 1 commit into from
Jan 24, 2026
Merged

Mark InstructionVisitor as ~Copyable #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/WasmParser/BinaryInstructionDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,10 @@ protocol BinaryInstructionDecoder {
}

@inlinable
func parseBinaryInstruction(visitor: inout some InstructionVisitor, decoder: inout some BinaryInstructionDecoder) throws -> Bool {
func parseBinaryInstruction(
visitor: inout some InstructionVisitor & ~Copyable,
decoder: inout some BinaryInstructionDecoder
) throws -> Bool {
visitor.binaryOffset = decoder.offset
let opcode0 = try decoder.claimNextByte()
switch opcode0 {
Expand Down
6 changes: 3 additions & 3 deletions Sources/WasmParser/InstructionVisitor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ extension AnyInstructionVisitor {
///
/// The visitor pattern is used while parsing WebAssembly expressions to allow for easy extensibility.
/// See the expression parsing method ``Code/parseExpression(visitor:)``
public protocol InstructionVisitor {
public protocol InstructionVisitor: ~Copyable {
associatedtype VisitorError: Error
/// Current offset in visitor's instruction stream.
var binaryOffset: Int { get set }
Expand Down Expand Up @@ -912,7 +912,7 @@ public protocol InstructionVisitor {
mutating func visitUnknown(_ opcode: [UInt8]) throws(VisitorError) -> Bool
}

extension InstructionVisitor {
extension InstructionVisitor where Self: ~Copyable {
/// Visits an instruction.
public mutating func visit(_ instruction: Instruction) throws(VisitorError) {
switch instruction {
Expand Down Expand Up @@ -1036,7 +1036,7 @@ extension InstructionVisitor {
}

// MARK: - Placeholder implementations
extension InstructionVisitor {
extension InstructionVisitor where Self: ~Copyable {
public mutating func visitUnreachable() throws(VisitorError) {}
public mutating func visitNop() throws(VisitorError) {}
public mutating func visitBlock(blockType: BlockType) throws(VisitorError) {}
Expand Down
4 changes: 2 additions & 2 deletions Sources/WasmParser/WasmParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ extension Code {
/// }
/// ````
@inlinable
public func parseExpression<V: InstructionVisitor>(visitor: inout V) throws {
public func parseExpression(visitor: inout some InstructionVisitor & ~Copyable) throws {
var parser = Parser(stream: StaticByteStream(bytes: self.expression), features: self.features)
var lastIsEnd: Bool?
while try !parser.stream.hasReachedEnd() {
Expand Down Expand Up @@ -920,7 +920,7 @@ extension Parser: BinaryInstructionDecoder {
/// Returns: `true` if the parsed instruction is the block end instruction.
@inline(__always)
@inlinable
mutating func parseInstruction<V: InstructionVisitor>(visitor v: inout V) throws -> Bool {
mutating func parseInstruction(visitor v: inout some InstructionVisitor & ~Copyable) throws -> Bool {
return try parseBinaryInstruction(visitor: &v, decoder: &self)
}

Expand Down
11 changes: 7 additions & 4 deletions Utilities/Sources/WasmGen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ enum WasmGen {
///
/// The visitor pattern is used while parsing WebAssembly expressions to allow for easy extensibility.
/// See the expression parsing method ``Code/parseExpression(visitor:)``
public protocol InstructionVisitor {
public protocol InstructionVisitor: ~Copyable {
associatedtype VisitorError: Error
/// Current offset in visitor's instruction stream.
var binaryOffset: Int { get set }
Expand All @@ -122,7 +122,7 @@ enum WasmGen {
code += """


extension InstructionVisitor {
extension InstructionVisitor where Self: ~Copyable {
/// Visits an instruction.
public mutating func visit(_ instruction: Instruction) throws(VisitorError) {
switch instruction {
Expand Down Expand Up @@ -154,7 +154,7 @@ enum WasmGen {
code += """

// MARK: - Placeholder implementations
extension InstructionVisitor {
extension InstructionVisitor where Self: ~Copyable {

"""
for instruction in instructions.categorized {
Expand Down Expand Up @@ -573,7 +573,10 @@ enum WasmGen {
code += """

@inlinable
func parseBinaryInstruction(visitor: inout some InstructionVisitor, decoder: inout some BinaryInstructionDecoder) throws -> Bool {
func parseBinaryInstruction(
visitor: inout some InstructionVisitor & ~Copyable,
decoder: inout some BinaryInstructionDecoder
) throws -> Bool {
visitor.binaryOffset = decoder.offset
"""

Expand Down