Simplify FunctionPass to eliminate the CFGFunctionPass/MLFunctionPass

distinction.  FunctionPasses can now choose to get called on all functions, or
have the driver split CFG/ML Functions up for them.  NFC.

PiperOrigin-RevId: 218775885

1 files changed, 19 insertions, 7 deletions

diff --git a/mlir/lib/Transforms/Utils/Pass.cpp b/mlir/lib/Transforms/Utils/Pass.cpp
index 8b1110798bd..e4edee31900 100644
--- a/mlir/lib/Transforms/Utils/Pass.cpp
+++ b/mlir/lib/Transforms/Utils/Pass.cpp
@@ -23,19 +23,31 @@
 #include "mlir/IR/CFGFunction.h"
 #include "mlir/IR/MLFunction.h"
 #include "mlir/IR/Module.h"
-
 using namespace mlir;
 
+/// Out of line virtual method to ensure vtables and metadata are emitted to a
+/// single .o file.
+void Pass::anchor() {}
+
+/// Out of line virtual method to ensure vtables and metadata are emitted to a
+/// single .o file.
+void ModulePass::anchor() {}
+
 /// Function passes walk a module and look at each function with their
 /// corresponding hooks and terminates upon error encountered.
 PassResult FunctionPass::runOnModule(Module *m) {
   for (auto &fn : *m) {
-    if (auto *mlFunc = dyn_cast<MLFunction>(&fn))
-      if (runOnMLFunction(mlFunc))
-        return failure();
-    if (auto *cfgFunc = dyn_cast<CFGFunction>(&fn))
-      if (runOnCFGFunction(cfgFunc))
-        return failure();
+    if (runOnFunction(&fn))
+      return failure();
   }
   return success();
 }
+
+PassResult FunctionPass::runOnFunction(Function *fn) {
+  if (auto *mlFunc = dyn_cast<MLFunction>(fn))
+    return runOnMLFunction(mlFunc);
+  if (auto *cfgFunc = dyn_cast<CFGFunction>(fn))
+    return runOnCFGFunction(cfgFunc);
+
+  return success();
+}