2 files changed, 7 insertions, 8 deletions
diff --git a/mlir/include/mlir/Conversion/LoopToStandard/ConvertLoopToStandard.h b/mlir/include/mlir/Conversion/LoopToStandard/ConvertLoopToStandard.h
index e44e723376f..095c9f470b3 100644
--- a/mlir/include/mlir/Conversion/LoopToStandard/ConvertLoopToStandard.h
+++ b/mlir/include/mlir/Conversion/LoopToStandard/ConvertLoopToStandard.h
@@ -22,10 +22,9 @@
 #include <vector>
 
 namespace mlir {
-class FuncOp;
 struct LogicalResult;
 class MLIRContext;
-template <typename T> class OpPassBase;
+class Pass;
 class RewritePattern;
 
 // Owning list of rewriting patterns.
@@ -38,7 +37,7 @@ void populateLoopToStdConversionPatterns(OwningRewritePatternList &patterns,
                                          MLIRContext *ctx);
 
 /// Creates a pass to convert loop.for, loop.if and loop.terminator ops to CFG.
-std::unique_ptr<OpPassBase<FuncOp>> createLowerToCFGPass();
+std::unique_ptr<Pass> createLowerToCFGPass();
 
 } // namespace mlir
 
diff --git a/mlir/lib/Conversion/LoopToStandard/ConvertLoopToStandard.cpp b/mlir/lib/Conversion/LoopToStandard/ConvertLoopToStandard.cpp
index 08ee320f7d9..ff93ce58fd4 100644
--- a/mlir/lib/Conversion/LoopToStandard/ConvertLoopToStandard.cpp
+++ b/mlir/lib/Conversion/LoopToStandard/ConvertLoopToStandard.cpp
@@ -38,8 +38,8 @@ using namespace mlir::loop;
 
 namespace {
 
-struct LoopToStandardPass : public FunctionPass<LoopToStandardPass> {
-  void runOnFunction() override;
+struct LoopToStandardPass : public OperationPass<LoopToStandardPass> {
+  void runOnOperation() override;
 };
 
 // Create a CFG subgraph for the loop around its body blocks (if the body
@@ -261,16 +261,16 @@ void mlir::populateLoopToStdConversionPatterns(
   patterns.insert<ForLowering, IfLowering, TerminatorLowering>(ctx);
 }
 
-void LoopToStandardPass::runOnFunction() {
+void LoopToStandardPass::runOnOperation() {
   OwningRewritePatternList patterns;
   populateLoopToStdConversionPatterns(patterns, &getContext());
   ConversionTarget target(getContext());
   target.addLegalDialect<StandardOpsDialect>();
-  if (failed(applyPartialConversion(getFunction(), target, patterns)))
+  if (failed(applyPartialConversion(getOperation(), target, patterns)))
     signalPassFailure();
 }
 
-std::unique_ptr<OpPassBase<FuncOp>> mlir::createLowerToCFGPass() {
+std::unique_ptr<Pass> mlir::createLowerToCFGPass() {
   return std::make_unique<LoopToStandardPass>();
 }