[wasm] Remove parameterTypes from WasmBranch

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

Author: Liedtke

Sources/Fuzzilli/Base/ProgramBuilder.swift

@@ -3954,7 +3954,7 @@ public class ProgramBuilder {
         public func wasmBranch(to label: Variable, args: [Variable] = []) {
             let labelType = b.type(of: label)
             checkArgumentsMatchLabelType(label: labelType, args: args)
-            b.emit(WasmBranch(labelTypes: labelType.wasmLabelType!.parameters), withInputs: [label] + args)
+            b.emit(WasmBranch(parameterCount: labelType.wasmLabelType!.parameters.count), withInputs: [label] + args)
         }
 
         public func wasmBranchIf(_ condition: Variable, to label: Variable, args: [Variable] = [], hint: WasmBranchHint = .None) {

Sources/Fuzzilli/FuzzIL/Instruction.swift

@@ -1447,10 +1447,8 @@ extension Instruction: ProtobufConvertible {
                 $0.wasmDefineTag = Fuzzilli_Protobuf_WasmDefineTag.with {
                     $0.parameterTypes = op.parameterTypes.map(ILTypeToWasmTypeEnum)
                 }
-            case .wasmBranch(let op):
-                $0.wasmBranch = Fuzzilli_Protobuf_WasmBranch.with {
-                    $0.parameters = op.labelTypes.map(ILTypeToWasmTypeEnum)
-                }
+            case .wasmBranch(_):
+                $0.wasmBranch = Fuzzilli_Protobuf_WasmBranch()
             case .wasmBranchIf(let op):
                 $0.wasmBranchIf = Fuzzilli_Protobuf_WasmBranchIf.with {
                     $0.parameters = op.labelTypes.map(ILTypeToWasmTypeEnum)
@@ -2494,8 +2492,8 @@ extension Instruction: ProtobufConvertible {
             op = WasmRethrow()
         case .wasmDefineTag(let p):
             op = WasmDefineTag(parameterTypes: p.parameterTypes.map(WasmTypeEnumToILType))
-        case .wasmBranch(let p):
-            op = WasmBranch(labelTypes: p.parameters.map(WasmTypeEnumToILType))
+        case .wasmBranch(_):
+            op = WasmBranch(parameterCount: inouts.count - 1)
         case .wasmBranchIf(let p):
             op = WasmBranchIf(labelTypes: p.parameters.map(WasmTypeEnumToILType), hint: try convertEnum(p.hint, WasmBranchHint.allCases))
         case .wasmBranchTable(let p):

Sources/Fuzzilli/FuzzIL/WasmOperations.swift

@@ -1494,13 +1494,12 @@ final class WasmRethrow: WasmOperation {
 
 final class WasmBranch: WasmOperation {
     override var opcode: Opcode { .wasmBranch(self) }
-    let labelTypes: [ILType]
-
-    init(labelTypes: [ILType]) {
-        self.labelTypes = labelTypes
-        super.init(numInputs: 1 + labelTypes.count, requiredContext: [.wasmFunction])
 
+    init(parameterCount: Int) {
+        super.init(numInputs: 1 + parameterCount, requiredContext: [.wasmFunction])
     }
+
+    var parameterCount: Int {numInputs - 1}
 }
 
 final class WasmBranchIf: WasmOperation {

Sources/Fuzzilli/Lifting/WasmLifter.swift

@@ -1957,7 +1957,7 @@ public class WasmLifter {
             return Data([0x09] + Leb128.unsignedEncode(blockDepth))
         case .wasmBranch(let op):
             let branchDepth = try branchDepthFor(label: wasmInstruction.input(0))
-            return Data([0x0C]) + Leb128.unsignedEncode(branchDepth) + Data(op.labelTypes.map {_ in 0x1A})
+            return Data([0x0C]) + Leb128.unsignedEncode(branchDepth) + Array(repeating: 0x1a, count: op.parameterCount)
         case .wasmBranchIf(let op):
             currentFunction!.addBranchHint(op.hint)
             let branchDepth = try branchDepthFor(label: wasmInstruction.input(0))

Sources/Fuzzilli/Protobuf/operations.pb.swift

@@ -5343,8 +5343,6 @@ public struct Fuzzilli_Protobuf_WasmBranch: Sendable {
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  public var parameters: [Fuzzilli_Protobuf_WasmILType] = []
-
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
   public init() {}
@@ -14139,29 +14137,18 @@ extension Fuzzilli_Protobuf_WasmDefineTag: SwiftProtobuf.Message, SwiftProtobuf.
 
 extension Fuzzilli_Protobuf_WasmBranch: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".WasmBranch"
-  public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}parameters\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.parameters) }()
-      default: break
-      }
-    }
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
   }
 
   public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.parameters.isEmpty {
-      try visitor.visitRepeatedMessageField(value: self.parameters, fieldNumber: 1)
-    }
     try unknownFields.traverse(visitor: &visitor)
   }
 
   public static func ==(lhs: Fuzzilli_Protobuf_WasmBranch, rhs: Fuzzilli_Protobuf_WasmBranch) -> Bool {
-    if lhs.parameters != rhs.parameters {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }

Sources/Fuzzilli/Protobuf/operations.proto

@@ -1311,7 +1311,6 @@ message WasmDefineTag {
 }
 
 message WasmBranch {
-  repeated WasmILType parameters = 1;
 }
 
 enum WasmBranchHint {