[js] Refactor Loops to mutualize common code.

Bug: 515363087
Change-Id: I41e4b487ee08dbf7da22959c6c1d08e4099a6ad4
Reviewed-on: https://chrome-internal-review.googlesource.com/c/v8/fuzzilli/+/9317282
Reviewed-by: Matthias Liedtke <mliedtke@google.com>
Commit-Queue: Raphaël Hérouart <rherouart@google.com>
Auto-Submit: Raphaël Hérouart <rherouart@google.com>

Author: rherouart-collab

Sources/Fuzzilli/Base/ProgramBuilder.swift

@@ -4120,97 +4120,19 @@ public class ProgramBuilder {
         emit(EndForLoop())
     }
 
-    public func buildForInLoop(_ obj: Variable, _ body: (Variable, Variable) -> Void) {
-        let instr = emit(BeginForInLoop(), withInputs: [obj])
-        body(instr.innerOutput(0), instr.innerOutput(1))
-        emit(EndForInLoop())
-    }
-
-    public func buildForInLoop(_ obj: Variable, _ body: (Variable) -> Void) {
-        buildForInLoop(obj) { i, _ in body(i) }
-    }
-
-    public func buildForOfLoop(_ obj: Variable, _ body: (Variable, Variable) -> Void) {
-        let instr = emit(BeginForOfLoop(), withInputs: [obj])
-        body(instr.innerOutput(0), instr.innerOutput(1))
-        emit(EndForOfLoop())
-    }
-
-    public func buildForAwaitOfLoop(_ obj: Variable, _ body: (Variable, Variable) -> Void) {
-        let instr = emit(BeginForAwaitOfLoop(), withInputs: [obj])
-        body(instr.innerOutput(0), instr.innerOutput(1))
-        emit(EndForOfLoop())
-    }
-
-    public func buildForOfLoop(_ obj: Variable, _ body: (Variable) -> Void) {
-        buildForOfLoop(obj) { i, _ in body(i) }
-    }
-
-    public func buildForAwaitOfLoop(_ obj: Variable, _ body: (Variable) -> Void) {
-        buildForAwaitOfLoop(obj) { i, _ in body(i) }
-    }
-
-    public func buildForOfLoop(
-        _ obj: Variable, selecting indices: [Int64], hasRestElement: Bool = false,
-        _ body: ([Variable], Variable) -> Void
-    ) {
-        let instr = emit(
-            BeginForOfLoopWithDestruct(indices: indices, hasRestElement: hasRestElement),
-            withInputs: [obj])
-        let label = instr.innerOutputs.last!
-        let vars = instr.innerOutputs.dropLast()
-        body(Array(vars), label)
-        emit(EndForOfLoop())
-    }
-
-    public func buildForOfLoop(
-        _ obj: Variable, selecting indices: [Int64], hasRestElement: Bool = false,
-        _ body: ([Variable]) -> Void
-    ) {
-        buildForOfLoop(obj, selecting: indices, hasRestElement: hasRestElement) { vars, _ in
-            body(vars)
-        }
-    }
-
-    public func buildForAwaitOfLoop(
-        _ obj: Variable, selecting indices: [Int64], hasRestElement: Bool = false,
+    public func buildForInOfLoop(
+        _ obj: Variable,
+        type: ForInOfLoopType,
+        isAsync: Bool,
+        header: LoopHeader,
         _ body: ([Variable], Variable) -> Void
     ) {
-        let instr = emit(
-            BeginForAwaitOfLoopWithDestruct(indices: indices, hasRestElement: hasRestElement),
-            withInputs: [obj])
+        let beginOp = ForLoop(type: type, isAsync: isAsync, header: header)
+        let instr = emit(beginOp, withInputs: [obj])
         let label = instr.innerOutputs.last!
         let vars = instr.innerOutputs.dropLast()
         body(Array(vars), label)
-        emit(EndForOfLoop())
-    }
-
-    public func buildForOfLoop(
-        _ obj: Variable, selectingProperties properties: [String], hasRestElement: Bool = false,
-        _ body: ([Variable], Variable) -> Void
-    ) {
-        let instr = emit(
-            BeginForOfLoopWithObjectDestruct(
-                properties: properties, hasRestElement: hasRestElement),
-            withInputs: [obj])
-        let label = instr.innerOutputs.last!
-        let vars = instr.innerOutputs.dropLast()
-        body(Array(vars), label)
-        emit(EndForOfLoop())
-    }
-
-    public func buildForAwaitOfLoop(
-        _ obj: Variable, selectingProperties properties: [String], hasRestElement: Bool = false,
-        _ body: ([Variable], Variable) -> Void
-    ) {
-        let instr = emit(
-            BeginForAwaitOfLoopWithObjectDestruct(
-                properties: properties, hasRestElement: hasRestElement),
-            withInputs: [obj])
-        let label = instr.innerOutputs.last!
-        let vars = instr.innerOutputs.dropLast()
-        body(Array(vars), label)
-        emit(EndForOfLoop())
+        emit(EndForLoop())
     }
 
     public func buildRepeatLoop(n numIterations: Int, _ body: (Variable, Variable) -> Void) {

Sources/Fuzzilli/CodeGen/CodeGeneratorWeights.swift

@@ -186,8 +186,8 @@ public let codeGeneratorWeights = [
     "ForInLoopGenerator":                       10,
     "ForOfLoopGenerator":                       10,
     "ForAwaitOfLoopGenerator":                  10,
-    "ForOfWithDestructLoopGenerator":           3,
-    "ForAwaitOfWithDestructLoopGenerator":      3,
+    "ForOfWithArrayDestructLoopGenerator":      3,
+    "ForAwaitOfWithArrayDestructLoopGenerator": 3,
     "ForOfWithObjectDestructLoopGenerator":      3,
     "ForAwaitOfWithObjectDestructLoopGenerator": 3,
     "RepeatLoopGenerator":                      10,