Skip to content

Remove TranslatorContext protocol and related generics #199

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
MaxDesiatov merged 1 commit into from
Oct 8, 2025
Merged

Remove TranslatorContext protocol and related generics #199

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
28 changes: 5 additions & 23 deletions Sources/WasmKit/Translator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,7 @@ class ISeqAllocator {
}
}

protocol TranslatorContext {
func resolveType(_ index: TypeIndex) throws -> FunctionType
func resolveBlockType(_ blockType: BlockType) throws -> FunctionType
func functionType(_ index: FunctionIndex, interner: Interner<FunctionType>) throws -> FunctionType
func globalType(_ index: GlobalIndex) throws -> ValueType
func isMemory64(memoryIndex index: MemoryIndex) throws -> Bool
func isMemory64(tableIndex index: TableIndex) throws -> Bool
func tableType(_ index: TableIndex) throws -> TableType
func elementType(_ index: ElementIndex) throws -> ReferenceType
func resolveCallee(_ index: FunctionIndex) -> InternalFunction?
func isSameInstance(_ instance: InternalInstance) -> Bool
func resolveGlobal(_ index: GlobalIndex) -> InternalGlobal?
func validateFunctionIndex(_ index: FunctionIndex) throws
var dataCount: UInt32? { get }
}

extension TranslatorContext {
extension InternalInstance {
func addressType(memoryIndex: MemoryIndex) throws -> ValueType {
return ValueType.addressType(isMemory64: try isMemory64(memoryIndex: memoryIndex))
}
Expand All @@ -59,9 +43,7 @@ extension TranslatorContext {
func validateElementSegment(_ index: ElementIndex) throws {
_ = try elementType(index)
}
}

extension InternalInstance: TranslatorContext {
func resolveType(_ index: TypeIndex) throws -> FunctionType {
guard Int(index) < self.types.count else {
throw ValidationError(.indexOutOfBounds("type", index, max: UInt32(self.types.count)))
Expand Down Expand Up @@ -311,7 +293,7 @@ struct StackLayout {
}
}

struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {
struct InstructionTranslator: InstructionVisitor {
typealias Output = Void

typealias LabelRef = Int
Expand Down Expand Up @@ -828,7 +810,7 @@ struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {

let allocator: ISeqAllocator
let funcTypeInterner: Interner<FunctionType>
let module: Context
let module: InternalInstance
private var iseqBuilder: ISeqBuilder
var controlStack: ControlStack
var valueStack: ValueStack
Expand All @@ -840,13 +822,13 @@ struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {
/// Whether a call to this function should be intercepted
let intercepting: Bool
var constantSlots: ConstSlots
let validator: InstructionValidator<Context>
let validator: InstructionValidator

init(
allocator: ISeqAllocator,
engineConfiguration: EngineConfiguration,
funcTypeInterner: Interner<FunctionType>,
module: Context,
module: InternalInstance,
type: FunctionType,
locals: [WasmTypes.ValueType],
functionIndex: FunctionIndex,
Expand Down
4 changes: 2 additions & 2 deletions Sources/WasmKit/Validator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ extension ValidationError.Message {
}

/// Validates instructions within a given context.
struct InstructionValidator<Context: TranslatorContext> {
let context: Context
struct InstructionValidator {
let context: InternalInstance

func validateMemArg(_ memarg: MemArg, naturalAlignment: Int) throws {
if memarg.align > naturalAlignment {
Expand Down