WasmParser/WAT: Add support for the tail-call proposal

swiftwasm · Jan 4, 2025 · 5cc0e46 · 5cc0e46
1 parent 5372f16
commit 5cc0e46
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Sources/WasmParser/WasmParser.swift b/Sources/WasmParser/WasmParser.swift
@@ -193,11 +193,14 @@ public struct WasmFeatureSet: OptionSet {
     /// The WebAssembly threads proposal
     @_alwaysEmitIntoClient
     public static var threads: WasmFeatureSet { WasmFeatureSet(rawValue: 1 << 2) }
+    /// The WebAssembly tail-call proposal
+    @_alwaysEmitIntoClient
+    public static var tailCall: WasmFeatureSet { WasmFeatureSet(rawValue: 1 << 3) }
 
     /// The default feature set
     public static let `default`: WasmFeatureSet = [.referenceTypes]
     /// The feature set with all features enabled
-    public static let all: WasmFeatureSet = [.memory64, .referenceTypes, .threads]
+    public static let all: WasmFeatureSet = [.memory64, .referenceTypes, .threads, .tailCall]
 }
 
 /// An error that occurs during parsing of a WebAssembly binary
@@ -629,6 +632,16 @@ extension Parser: BinaryInstructionDecoder {
         return (typeIndex, tableIndex)
     }
 
+    @inlinable mutating func visitReturnCall() throws -> UInt32 {
+        try parseUnsigned()
+    }
+
+    @inlinable mutating func visitReturnCallIndirect() throws -> (typeIndex: UInt32, tableIndex: UInt32) {
+        let typeIndex: TypeIndex = try parseUnsigned()
+        let tableIndex: TableIndex = try parseUnsigned()
+        return (typeIndex, tableIndex)
+    }
+
     @inlinable mutating func visitTypedSelect() throws -> WasmTypes.ValueType {
         let results = try parseVector { try parseValueType() }
         guard results.count == 1 else {

diff --git a/Tests/WATTests/EncoderTests.swift b/Tests/WATTests/EncoderTests.swift
@@ -116,7 +116,12 @@ class EncoderTests: XCTestCase {
 
                     let wast2jsonProcess = try Process.run(
                         wast2json,
-                        arguments: [wastFile.path, "-o", json.path]
+                        arguments: [
+                            wastFile.path,
+                            "--enable-memory64",
+                            "--enable-tail-call",
+                            "-o", json.path,
+                        ]
                     )
                     wast2jsonProcess.waitUntilExit()
 

diff --git a/Tests/WATTests/Spectest.swift b/Tests/WATTests/Spectest.swift
@@ -20,6 +20,7 @@ enum Spectest {
         var allFiles = [
             testsuitePath,
             testsuitePath.appendingPathComponent("proposals/memory64"),
+            testsuitePath.appendingPathComponent("proposals/tail-call"),
             rootDirectory.appendingPathComponent("Tests/WasmKitTests/ExtraSuite"),
         ].flatMap {
             try! FileManager.default.contentsOfDirectory(at: $0, includingPropertiesForKeys: nil)