remove shizo async

Author: dudcom

Package.swift

@@ -63,9 +63,10 @@ let package = Package(
                     "Protobuf/README.md",
                     "Protobuf/gen_programproto.py"],
                 resources: [
-                    // The ast.proto file is required by the node.js parser and stuff
                     .copy("Protobuf/ast.proto"),
-                    .copy("Compiler/Parser")]),
+                    .copy("Compiler/Parser/parser.js"),
+                    .copy("Compiler/Parser/package.json"),
+                    .copy("Compiler/Parser/README.md")]),
 
         .executableTarget(name: "REPRLRun",
                 dependencies: ["libreprl"]),

Sources/Fuzzilli/Compiler/JavaScriptParser.swift

@@ -36,8 +36,8 @@ public class JavaScriptParser {
 
         // This will only work if the executor is node as we will need to use node modules.
 
-        // The Parser/ subdirectory is copied verbatim into the module bundle, see Package.swift.
-        self.parserScriptPath = Bundle.module.path(forResource: "parser", ofType: "js", inDirectory: "Parser")!
+        // Parser files are in Compiler/Parser in the module bundle, see Package.swift.
+        self.parserScriptPath = Bundle.module.path(forResource: "parser", ofType: "js", inDirectory: "Compiler/Parser")!
 
         // Check if the parser works. If not, it's likely because its node.js dependencies have not been installed.
         do {

Sources/Fuzzilli/Minimization/DeduplicatingReducer.swift

@@ -14,7 +14,7 @@
 
 // Attempts deduplicate variables containing the same values.
 struct DeduplicatingReducer: Reducer {
-    func reduce(with helper: MinimizationHelper) async {
+    func reduce(with helper: MinimizationHelper) {
         // Currently we only handle CreateNamedVariable, but the code could easily be
         // extended to cover other types of values as well.
         // It's not obvious however which other values would benefit from this.
@@ -66,7 +66,7 @@ struct DeduplicatingReducer: Reducer {
         }
 
         if !replacements.isEmpty {
-            await helper.tryReplacements(replacements)
+            helper.tryReplacements(replacements)
         }
     }
 }

Sources/Fuzzilli/Minimization/GenericInstructionReducer.swift

@@ -14,13 +14,13 @@
 
 /// Removes simple instructions from a program if they are not required.
 struct GenericInstructionReducer: Reducer {
-    func reduce(with helper: MinimizationHelper) async {
+    func reduce(with helper: MinimizationHelper) {
         for instr in helper.code.reversed() {
             if !instr.isSimple || instr.isNop {
                 continue
             }
 
-            await helper.tryNopping(instructionAt: instr.index)
+            helper.tryNopping(instructionAt: instr.index)
         }
     }
 }

Sources/Fuzzilli/Minimization/LoopSimplifier.swift

@@ -26,7 +26,7 @@ struct LoopSimplifier: Reducer {
     // (if e.g. the loop is necessary to trigger JIT compilation) and so we test each reduction multiple times.
     private let numTestExecutions = 3
 
-    func reduce(with helper: MinimizationHelper) async {
+    func reduce(with helper: MinimizationHelper) {
         /// Here we keep blocks (i.e. something like an iterator) in use even while changing the underlying code.
         /// This works because the iteration order visits inner blocks before outer blocks, so we will never change
         /// block instructions that we will visit later on.
@@ -221,7 +221,7 @@ struct LoopSimplifier: Reducer {
             } else {
                 replacement = Instruction(BeginRepeatLoop(iterations: numIterations, exposesLoopCounter: false))
             }
-            if await helper.tryReplacing(instructionAt: group.head, with: replacement, numExecutions: numTestExecutions) {
+            if helper.tryReplacing(instructionAt: group.head, with: replacement, numExecutions: numTestExecutions) {
                 return
             }
         }
@@ -237,7 +237,7 @@ struct LoopSimplifier: Reducer {
                 newCode[headerIndex] = Instruction(BeginRepeatLoop(iterations: numIterations, exposesLoopCounter: false))
             }
             // After this change, the variable numbers may no longer be sequential as we may have removed instructions with inner outputs. So we need to also renumber the variables.
-            if await helper.tryReplacing(range: range, with: newCode, renumberVariables: true, numExecutions: numTestExecutions) {
+            if helper.tryReplacing(range: range, with: newCode, renumberVariables: true, numExecutions: numTestExecutions) {
                 return
             }
         }
@@ -326,6 +326,6 @@ struct LoopSimplifier: Reducer {
         }
 
         // We may have changed the order of variable declarations, so we need to renumber the variables.
-        await helper.tryReplacements(replacements, renumberVariables: true, numExecutions: numTestExecutions)
+        helper.tryReplacements(replacements, renumberVariables: true, numExecutions: numTestExecutions)
     }
 }

Sources/Fuzzilli/Minimization/VariadicInputReducer.swift

@@ -14,7 +14,7 @@
 
 /// Reducer to remove inputs from variadic operations.
 struct VariadicInputReducer: Reducer {
-    func reduce(with helper: MinimizationHelper) async {
+    func reduce(with helper: MinimizationHelper) {
         for instr in helper.code {
             guard instr.isVariadic else { continue }
             let index = instr.index
@@ -84,7 +84,7 @@ struct VariadicInputReducer: Reducer {
 
                 let inouts = instr.inputs.dropLast() + instr.outputs + instr.innerOutputs
                 instr = Instruction(newOp, inouts: inouts, flags: instr.flags)
-            } while await helper.tryReplacing(instructionAt: index, with: instr)
+            } while helper.tryReplacing(instructionAt: index, with: instr)
         }
     }
 }

Sources/Fuzzilli/Minimization/WasmTypeGroupReducer.swift

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 struct WasmTypeGroupReducer: Reducer {
-    func reduce(with helper: MinimizationHelper) async {
+    func reduce(with helper: MinimizationHelper) {
         // Compute all candidates: intermediate operations in a data flow chain.
         var candidates = [Int]()
         var uses = VariableMap<Int>()
@@ -49,6 +49,6 @@ struct WasmTypeGroupReducer: Reducer {
             let newInstr = Instruction(WasmEndTypeGroup(typesCount: newInoutsMap.count), inouts: newInouts, flags: .empty)
             replacements.append((candidate, newInstr))
         }
-        await helper.tryReplacements(replacements, renumberVariables: true)
+        helper.tryReplacements(replacements, renumberVariables: true)
     }
 }