[wasm] Remove paramterTypes from WasmBranchIf

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

Author: Liedtke

Sources/Fuzzilli/Base/ProgramBuilder.swift

@@ -3961,7 +3961,9 @@ public class ProgramBuilder {
             let labelType = b.type(of: label)
             checkArgumentsMatchLabelType(label: labelType, args: args)
             assert(b.type(of: condition).Is(.wasmi32))
-            b.emit(WasmBranchIf(labelTypes: labelType.wasmLabelType!.parameters, hint: hint), withInputs: [label] + args + [condition])
+            b.emit(
+                WasmBranchIf(parameterCount: labelType.wasmLabelType!.parameters.count, hint: hint),
+                withInputs: [label] + args + [condition])
         }
 
         public func wasmBranchTable(on: Variable, labels: [Variable], args: [Variable]) {

Sources/Fuzzilli/FuzzIL/Instruction.swift

@@ -1451,7 +1451,6 @@ extension Instruction: ProtobufConvertible {
                 $0.wasmBranch = Fuzzilli_Protobuf_WasmBranch()
             case .wasmBranchIf(let op):
                 $0.wasmBranchIf = Fuzzilli_Protobuf_WasmBranchIf.with {
-                    $0.parameters = op.labelTypes.map(ILTypeToWasmTypeEnum)
                     $0.hint = convertEnum(op.hint, WasmBranchHint.allCases)
                 }
             case .wasmBranchTable(let op):
@@ -2495,7 +2494,7 @@ extension Instruction: ProtobufConvertible {
         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))
+            op = WasmBranchIf(parameterCount: inouts.count - 2, hint: try convertEnum(p.hint, WasmBranchHint.allCases))
         case .wasmBranchTable(let p):
             op = WasmBranchTable(labelTypes: p.parameters.map(WasmTypeEnumToILType), valueCount: Int(p.valueCount))
         case .wasmBeginIf(let p):

Sources/Fuzzilli/FuzzIL/WasmOperations.swift

@@ -1504,15 +1504,15 @@ final class WasmBranch: WasmOperation {
 
 final class WasmBranchIf: WasmOperation {
     override var opcode: Opcode { .wasmBranchIf(self) }
-    let labelTypes: [ILType]
     let hint: WasmBranchHint
 
-    init(labelTypes: [ILType], hint: WasmBranchHint) {
-        self.labelTypes = labelTypes
+    init(parameterCount: Int, hint: WasmBranchHint) {
         self.hint = hint
         // The inputs are the label, the arguments and the condition.
-        super.init(numInputs: 1 + labelTypes.count + 1, attributes: [.isMutable], requiredContext: [.wasmFunction])
+        super.init(numInputs: 1 + parameterCount + 1, attributes: [.isMutable], requiredContext: [.wasmFunction])
     }
+
+    var parameterCount: Int {numInputs - 2}
 }
 
 final class WasmBranchTable: WasmOperation {

Sources/Fuzzilli/Lifting/WasmLifter.swift

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

Sources/Fuzzilli/Mutators/OperationMutator.swift

@@ -497,7 +497,7 @@ public class OperationMutator: BaseInstructionMutator {
                 : Int64.random(in: Int64.min...Int64.max) // most likely out of bounds
             newOp = WasmSimdLoad(kind: kind, staticOffset: staticOffset)
         case .wasmBranchIf(let op):
-            newOp = WasmBranchIf(labelTypes: op.labelTypes, hint: chooseUniform(from: WasmBranchHint.allCases))
+            newOp = WasmBranchIf(parameterCount: op.parameterCount, hint: chooseUniform(from: WasmBranchHint.allCases))
         case .wasmBeginIf(let op):
             newOp = WasmBeginIf(parameterCount: op.parameterCount, hint: chooseUniform(from: WasmBranchHint.allCases), inverted: Bool.random())
         case .wasmArrayGet(let op):

Sources/Fuzzilli/Protobuf/operations.pb.swift

@@ -5353,8 +5353,6 @@ public struct Fuzzilli_Protobuf_WasmBranchIf: Sendable {
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  public var parameters: [Fuzzilli_Protobuf_WasmILType] = []
-
   public var hint: Fuzzilli_Protobuf_WasmBranchHint = .branchhintNone
 
   public var unknownFields = SwiftProtobuf.UnknownStorage()
@@ -14156,33 +14154,28 @@ extension Fuzzilli_Protobuf_WasmBranch: SwiftProtobuf.Message, SwiftProtobuf._Me
 
 extension Fuzzilli_Protobuf_WasmBranchIf: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".WasmBranchIf"
-  public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}parameters\0\u{1}hint\0")
+  public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\u{2}hint\0")
 
   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) }()
       case 2: try { try decoder.decodeSingularEnumField(value: &self.hint) }()
       default: break
       }
     }
   }
 
   public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.parameters.isEmpty {
-      try visitor.visitRepeatedMessageField(value: self.parameters, fieldNumber: 1)
-    }
     if self.hint != .branchhintNone {
       try visitor.visitSingularEnumField(value: self.hint, fieldNumber: 2)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
   public static func ==(lhs: Fuzzilli_Protobuf_WasmBranchIf, rhs: Fuzzilli_Protobuf_WasmBranchIf) -> Bool {
-    if lhs.parameters != rhs.parameters {return false}
     if lhs.hint != rhs.hint {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true

Sources/Fuzzilli/Protobuf/operations.proto

@@ -1320,7 +1320,6 @@ enum WasmBranchHint {
 }
 
 message WasmBranchIf {
-  repeated WasmILType parameters = 1;
   WasmBranchHint hint = 2;
 }