diff options
4 files changed, 4 insertions, 7 deletions
diff --git a/flang/include/flang/Optimizer/HLFIR/Passes.h b/flang/include/flang/Optimizer/HLFIR/Passes.h index 5035415..e0b4111 100644 --- a/flang/include/flang/Optimizer/HLFIR/Passes.h +++ b/flang/include/flang/Optimizer/HLFIR/Passes.h @@ -25,7 +25,6 @@ namespace hlfir { std::unique_ptr<mlir::Pass> createConvertHLFIRtoFIRPass(); std::unique_ptr<mlir::Pass> createBufferizeHLFIRPass(); std::unique_ptr<mlir::Pass> createLowerHLFIRIntrinsicsPass(); -std::unique_ptr<mlir::Pass> createLowerHLFIROrderedAssignmentsPass(); #define GEN_PASS_REGISTRATION #include "flang/Optimizer/HLFIR/Passes.h.inc" diff --git a/flang/include/flang/Optimizer/HLFIR/Passes.td b/flang/include/flang/Optimizer/HLFIR/Passes.td index 0fe2d9c..9555467 100644 --- a/flang/include/flang/Optimizer/HLFIR/Passes.td +++ b/flang/include/flang/Optimizer/HLFIR/Passes.td @@ -34,7 +34,6 @@ def LowerHLFIRIntrinsics : Pass<"lower-hlfir-intrinsics", "::mlir::ModuleOp"> { def LowerHLFIROrderedAssignments : Pass<"lower-hlfir-ordered-assignments", "::mlir::ModuleOp"> { let summary = "Lower HLFIR ordered assignments like forall and where operations"; - let constructor = "hlfir::createLowerHLFIROrderedAssignmentsPass()"; let options = [ Option<"tryFusingAssignments", "fuse-assignments", "bool", /*default=*/"false", diff --git a/flang/include/flang/Tools/CLOptions.inc b/flang/include/flang/Tools/CLOptions.inc index 82a8aec..6993428 100644 --- a/flang/include/flang/Tools/CLOptions.inc +++ b/flang/include/flang/Tools/CLOptions.inc @@ -327,7 +327,7 @@ inline void createHLFIRToFIRPassPipeline( addNestedPassToAllTopLevelOperations( pm, hlfir::createOptimizedBufferization); } - pm.addPass(hlfir::createLowerHLFIROrderedAssignmentsPass()); + pm.addPass(hlfir::createLowerHLFIROrderedAssignments()); pm.addPass(hlfir::createLowerHLFIRIntrinsicsPass()); pm.addPass(hlfir::createBufferizeHLFIRPass()); pm.addPass(hlfir::createConvertHLFIRtoFIRPass()); diff --git a/flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp b/flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp index c9ff4b1..a1a89bb 100644 --- a/flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp +++ b/flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp @@ -1383,6 +1383,9 @@ class LowerHLFIROrderedAssignments : public hlfir::impl::LowerHLFIROrderedAssignmentsBase< LowerHLFIROrderedAssignments> { public: + using LowerHLFIROrderedAssignmentsBase< + LowerHLFIROrderedAssignments>::LowerHLFIROrderedAssignmentsBase; + void runOnOperation() override { // Running on a ModuleOp because this pass may generate FuncOp declaration // for runtime calls. This could be a FuncOp pass otherwise. @@ -1409,7 +1412,3 @@ public: } }; } // namespace - -std::unique_ptr<mlir::Pass> hlfir::createLowerHLFIROrderedAssignmentsPass() { - return std::make_unique<LowerHLFIROrderedAssignments>(); -} |