[wasm] Remove return types from wasmReturn

Bug: 445356784
Change-Id: Ia9ced154e6f1ce465c257e0e17c53782ec13f442
Reviewed-on: https://chrome-internal-review.googlesource.com/c/v8/fuzzilli/+/8926836
Reviewed-by: Doga Yüksel <dyuksel@google.com>
Commit-Queue: Matthias Liedtke <mliedtke@google.com>

Author: Liedtke

Sources/Fuzzilli/Base/ProgramBuilder.swift

@@ -4203,17 +4203,16 @@ public class ProgramBuilder {
         }
 
         public func wasmReturn(_ values: [Variable]) {
-            b.emit(WasmReturn(returnTypes: values.map(b.type)), withInputs: values, types: signature.outputTypes)
+            b.emit(WasmReturn(returnCount: values.count), withInputs: values, types: signature.outputTypes)
         }
 
         public func wasmReturn(_ returnVariable: Variable) {
-            let returnType = b.type(of: returnVariable)
-            b.emit(WasmReturn(returnTypes: [returnType]), withInputs: [returnVariable], types: signature.outputTypes)
+            b.emit(WasmReturn(returnCount: 1), withInputs: [returnVariable], types: signature.outputTypes)
         }
 
         public func wasmReturn() {
             assert(signature.outputTypes.isEmpty)
-            b.emit(WasmReturn(returnTypes: []), withInputs: [])
+            b.emit(WasmReturn(returnCount: 0), withInputs: [])
         }
 
         @discardableResult

Sources/Fuzzilli/FuzzIL/Instruction.swift

@@ -1127,10 +1127,8 @@ extension Instruction: ProtobufConvertible {
                 $0.constf64 = Fuzzilli_Protobuf_Constf64.with { $0.value = op.value }
             case .constf32(let op):
                 $0.constf32 = Fuzzilli_Protobuf_Constf32.with { $0.value = op.value }
-            case .wasmReturn(let op):
-                $0.wasmReturn = Fuzzilli_Protobuf_WasmReturn.with {
-                    $0.returnTypes = op.returnTypes.map(ILTypeToWasmTypeEnum)
-                }
+            case .wasmReturn(_):
+                $0.wasmReturn = Fuzzilli_Protobuf_WasmReturn()
             case .wasmJsCall(let op):
                 $0.wasmJsCall = Fuzzilli_Protobuf_WasmJsCall.with {
                     $0.parameterTypes = op.functionSignature.parameterTypes.map(ILTypeToWasmTypeEnum)
@@ -2279,8 +2277,8 @@ extension Instruction: ProtobufConvertible {
             op = Constf32(value: p.value)
         case .constf64(let p):
             op = Constf64(value: Float64(p.value))
-        case .wasmReturn(let p):
-            op = WasmReturn(returnTypes: p.returnTypes.map(WasmTypeEnumToILType))
+        case .wasmReturn(_):
+            op = WasmReturn(returnCount: inouts.count)
         case .wasmJsCall(let p):
             let parameters = p.parameterTypes.map(WasmTypeEnumToILType)
             let outputs = p.outputTypes.map(WasmTypeEnumToILType)

Sources/Fuzzilli/FuzzIL/WasmOperations.swift

@@ -74,11 +74,9 @@ final class Constf64: WasmOperation {
 
 final class WasmReturn: WasmOperation {
     override var opcode: Opcode { .wasmReturn(self) }
-    let returnTypes: [ILType]
 
-    init(returnTypes: [ILType]) {
-        self.returnTypes = returnTypes
-        super.init(numInputs: returnTypes.count, attributes: [.isJump], requiredContext: [.wasmFunction])
+    init(returnCount: Int) {
+        super.init(numInputs: returnCount, attributes: [.isJump], requiredContext: [.wasmFunction])
     }
 }
 

Sources/Fuzzilli/Protobuf/operations.pb.swift

@@ -4122,8 +4122,6 @@ public struct Fuzzilli_Protobuf_WasmReturn: Sendable {
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  public var returnTypes: [Fuzzilli_Protobuf_WasmILType] = []
-
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
   public init() {}
@@ -11529,29 +11527,18 @@ extension Fuzzilli_Protobuf_Constf64: SwiftProtobuf.Message, SwiftProtobuf._Mess
 
 extension Fuzzilli_Protobuf_WasmReturn: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".WasmReturn"
-  public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}returnTypes\0")
+  public static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
   public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
-      switch fieldNumber {
-      case 1: try { try decoder.decodeRepeatedMessageField(value: &self.returnTypes) }()
-      default: break
-      }
-    }
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
   }
 
   public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.returnTypes.isEmpty {
-      try visitor.visitRepeatedMessageField(value: self.returnTypes, fieldNumber: 1)
-    }
     try unknownFields.traverse(visitor: &visitor)
   }
 
   public static func ==(lhs: Fuzzilli_Protobuf_WasmReturn, rhs: Fuzzilli_Protobuf_WasmReturn) -> Bool {
-    if lhs.returnTypes != rhs.returnTypes {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }

Sources/Fuzzilli/Protobuf/operations.proto

@@ -884,7 +884,6 @@ message Constf64 {
 }
 
 message WasmReturn {
-  repeated WasmILType returnTypes = 1;
 }
 
 // We only serialize the wasm types as the rest would be overkill and are not needed.