llvm-reduce: Use consistent ReductionFunc types

Some of these were relying on ReducerWorkItem's operator Module&.

1 files changed, 13 insertions, 4 deletions

diff --git a/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp b/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp
index 416b1652eb99..c49fcb9855d4 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp
@@ -19,7 +19,8 @@
 
 using namespace llvm;
 
-static void reduceUsingSimplifyCFG(Oracle &O, Module &Program) {
+static void reduceUsingSimplifyCFG(Oracle &O, ReducerWorkItem &WorkItem) {
+  Module &Program = WorkItem.getModule();
   SmallVector<BasicBlock *, 16> ToSimplify;
   for (auto &F : Program)
     for (auto &BB : F)
@@ -33,7 +34,9 @@ static void reduceUsingSimplifyCFG(Oracle &O, Module &Program) {
 void llvm::reduceUsingSimplifyCFGDeltaPass(TestRunner &Test) {
   runDeltaPass(Test, reduceUsingSimplifyCFG, "Reducing using SimplifyCFG");
 }
-static void reduceConditionals(Oracle &O, Module &M, bool Direction) {
+static void reduceConditionals(Oracle &O, ReducerWorkItem &WorkItem,
+                               bool Direction) {
+  Module &M = WorkItem.getModule();
   SmallVector<BasicBlock *, 16> ToSimplify;
 
   for (auto &F : M) {
@@ -58,12 +61,18 @@ static void reduceConditionals(Oracle &O, Module &M, bool Direction) {
 
 void llvm::reduceConditionalsTrueDeltaPass(TestRunner &Test) {
   runDeltaPass(
-      Test, [](Oracle &O, Module &M) { reduceConditionals(O, M, true); },
+      Test,
+      [](Oracle &O, ReducerWorkItem &WorkItem) {
+        reduceConditionals(O, WorkItem, true);
+      },
       "Reducing conditional branches to true");
 }
 
 void llvm::reduceConditionalsFalseDeltaPass(TestRunner &Test) {
   runDeltaPass(
-      Test, [](Oracle &O, Module &M) { reduceConditionals(O, M, false); },
+      Test,
+      [](Oracle &O, ReducerWorkItem &WorkItem) {
+        reduceConditionals(O, WorkItem, false);
+      },
       "Reducing conditional branches to false");
 }