[wasm] Remove parameter types from wasmBranchTable

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

Author: Liedtke

Sources/Fuzzilli/Base/ProgramBuilder.swift

@@ -3967,11 +3967,8 @@ public class ProgramBuilder {
         }
 
         public func wasmBranchTable(on: Variable, labels: [Variable], args: [Variable]) {
-            let argumentTypes = args.map({b.type(of: $0)})
-            labels.forEach {
-                checkArgumentsMatchLabelType(label: b.type(of: $0), args: args)
-            }
-            b.emit(WasmBranchTable(labelTypes: argumentTypes, valueCount: labels.count - 1),
+            labels.forEach { checkArgumentsMatchLabelType(label: b.type(of: $0), args: args) }
+            b.emit(WasmBranchTable(parameterCount: args.count, valueCount: labels.count - 1),
                 withInputs: labels + args + [on])
         }
 

Sources/Fuzzilli/FuzzIL/Instruction.swift

@@ -1455,7 +1455,6 @@ extension Instruction: ProtobufConvertible {
                 }
             case .wasmBranchTable(let op):
                 $0.wasmBranchTable = Fuzzilli_Protobuf_WasmBranchTable.with {
-                    $0.parameters = op.labelTypes.map(ILTypeToWasmTypeEnum)
                     $0.valueCount = UInt32(op.valueCount)
                 }
             case .wasmBeginIf(let op):
@@ -2496,7 +2495,7 @@ extension Instruction: ProtobufConvertible {
         case .wasmBranchIf(let p):
             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))
+            op = WasmBranchTable(parameterCount: inouts.count - Int(p.valueCount) - 2, valueCount: Int(p.valueCount))
         case .wasmBeginIf(let p):
             op = WasmBeginIf(parameterCount: Int(p.parameterCount), hint: try convertEnum(p.hint, WasmBranchHint.allCases), inverted: p.inverted)
         case .wasmBeginElse(let p):

Sources/Fuzzilli/FuzzIL/WasmOperations.swift

@@ -1517,16 +1517,17 @@ final class WasmBranchIf: WasmOperation {
 
 final class WasmBranchTable: WasmOperation {
     override var opcode: Opcode { .wasmBranchTable(self) }
-    let labelTypes: [ILType]
     // The number of cases in the br_table. Note that the number of labels is one higher as each
     // br_table has a default label.
     let valueCount: Int
 
-    init(labelTypes: [ILType], valueCount: Int) {
-        self.labelTypes = labelTypes
+    init(parameterCount: Int, valueCount: Int) {
         self.valueCount = valueCount
-        super.init(numInputs: valueCount + 1 + labelTypes.count + 1, requiredContext: [.wasmFunction])
+        // Inputs: the case labels, the default label, the arguments and the condition.
+        super.init(numInputs: valueCount + 1 + parameterCount + 1, requiredContext: [.wasmFunction])
     }
+
+    var parameterCount: Int {numInputs - valueCount - 2}
 }
 
 // TODO: make this comprehensive, currently only works for locals, or assumes every thing it reassigns to is a local.

Sources/Fuzzilli/Protobuf/operations.pb.swift

@@ -5365,8 +5365,6 @@ public struct Fuzzilli_Protobuf_WasmBranchTable: Sendable {
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  public var parameters: [Fuzzilli_Protobuf_WasmILType] = []
-
   public var valueCount: UInt32 = 0
 
   public var unknownFields = SwiftProtobuf.UnknownStorage()
@@ -14184,33 +14182,28 @@ extension Fuzzilli_Protobuf_WasmBranchIf: SwiftProtobuf.Message, SwiftProtobuf._
 
 extension Fuzzilli_Protobuf_WasmBranchTable: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".WasmBranchTable"
-  public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}parameters\0\u{1}valueCount\0")
+  public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\u{2}valueCount\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.decodeSingularUInt32Field(value: &self.valueCount) }()
       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.valueCount != 0 {
       try visitor.visitSingularUInt32Field(value: self.valueCount, fieldNumber: 2)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
   public static func ==(lhs: Fuzzilli_Protobuf_WasmBranchTable, rhs: Fuzzilli_Protobuf_WasmBranchTable) -> Bool {
-    if lhs.parameters != rhs.parameters {return false}
     if lhs.valueCount != rhs.valueCount {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true

Sources/Fuzzilli/Protobuf/operations.proto

@@ -1324,7 +1324,6 @@ message WasmBranchIf {
 }
 
 message WasmBranchTable {
-  repeated WasmILType parameters = 1;
   uint32 valueCount = 2;
 }