From d92f3e032329ec235289efe5a1ec347be08bb2ad Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser@berlin.de>
Date: Wed, 10 Jan 2024 16:30:59 +0100
Subject: [PATCH] [CIR][NFC] Canonicalize the names of the lowering classes

---
 .../Lowering/ThroughMLIR/LowerCIRToMLIR.cpp   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp b/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp
index 0853eeb87782..e0a06c5bf401 100644
--- a/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp
+++ b/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp
@@ -74,7 +74,7 @@ struct ConvertCIRToMLIRPass
   virtual StringRef getArgument() const override { return "cir-to-mlir"; }
 };
 
-class CIRCallLowering : public mlir::OpConversionPattern<mlir::cir::CallOp> {
+class CIRCallOpLowering : public mlir::OpConversionPattern<mlir::cir::CallOp> {
 public:
   using OpConversionPattern<mlir::cir::CallOp>::OpConversionPattern;
 
@@ -91,7 +91,7 @@ class CIRCallLowering : public mlir::OpConversionPattern<mlir::cir::CallOp> {
   }
 };
 
-class CIRAllocaLowering
+class CIRAllocaOpLowering
     : public mlir::OpConversionPattern<mlir::cir::AllocaOp> {
 public:
   using OpConversionPattern<mlir::cir::AllocaOp>::OpConversionPattern;
@@ -109,7 +109,7 @@ class CIRAllocaLowering
   }
 };
 
-class CIRLoadLowering : public mlir::OpConversionPattern<mlir::cir::LoadOp> {
+class CIRLoadOpLowering : public mlir::OpConversionPattern<mlir::cir::LoadOp> {
 public:
   using OpConversionPattern<mlir::cir::LoadOp>::OpConversionPattern;
 
@@ -121,7 +121,8 @@ class CIRLoadLowering : public mlir::OpConversionPattern<mlir::cir::LoadOp> {
   }
 };
 
-class CIRStoreLowering : public mlir::OpConversionPattern<mlir::cir::StoreOp> {
+class CIRStoreOpLowering
+    : public mlir::OpConversionPattern<mlir::cir::StoreOp> {
 public:
   using OpConversionPattern<mlir::cir::StoreOp>::OpConversionPattern;
 
@@ -134,7 +135,7 @@ class CIRStoreLowering : public mlir::OpConversionPattern<mlir::cir::StoreOp> {
   }
 };
 
-class CIRConstantLowering
+class CIRConstantOpLowering
     : public mlir::OpConversionPattern<mlir::cir::ConstantOp> {
 public:
   using OpConversionPattern<mlir::cir::ConstantOp>::OpConversionPattern;
@@ -158,7 +159,7 @@ class CIRConstantLowering
   }
 };
 
-class CIRFuncLowering : public mlir::OpConversionPattern<mlir::cir::FuncOp> {
+class CIRFuncOpLowering : public mlir::OpConversionPattern<mlir::cir::FuncOp> {
 public:
   using OpConversionPattern<mlir::cir::FuncOp>::OpConversionPattern;
 
@@ -602,9 +603,9 @@ void populateCIRToMLIRConversionPatterns(mlir::RewritePatternSet &patterns,
                                          mlir::TypeConverter &converter) {
   patterns.add<CIRReturnLowering, CIRBrOpLowering>(patterns.getContext());
 
-  patterns.add<CIRCmpOpLowering, CIRCallLowering, CIRUnaryOpLowering,
-               CIRBinOpLowering, CIRLoadLowering, CIRConstantLowering,
-               CIRStoreLowering, CIRAllocaLowering, CIRFuncLowering,
+  patterns.add<CIRCmpOpLowering, CIRCallOpLowering, CIRUnaryOpLowering,
+               CIRBinOpLowering, CIRLoadOpLowering, CIRConstantOpLowering,
+               CIRStoreOpLowering, CIRAllocaOpLowering, CIRFuncOpLowering,
                CIRScopeOpLowering, CIRBrCondOpLowering, CIRTernaryOpLowering,
                CIRYieldOpLowering>(converter, patterns.getContext());
 }