Fix autos, add const getMLIRContext()

Author: andykaylor

clang/include/clang/CIR/CIRGenerator.h

@@ -56,6 +56,7 @@ class CIRGenerator : public clang::ASTConsumer {
   bool HandleTopLevelDecl(clang::DeclGroupRef group) override;
   mlir::ModuleOp getModule() const;
   mlir::MLIRContext &getMLIRContext() { return *mlirContext; }
+  const mlir::MLIRContext &getMLIRContext() const { return *mlirContext; }
 };
 
 } // namespace cir

clang/lib/CIR/FrontendAction/CIRGenAction.cpp

@@ -93,7 +93,8 @@ class CIRGenConsumer : public clang::ASTConsumer {
       }
       break;
     case CIRGenAction::OutputType::EmitMLIR: {
-      auto LoweredMlirModule = lowerFromCIRToMLIR(MlirModule, MlirCtx);
+      mlir::ModuleOp LoweredMlirModule =
+          lowerFromCIRToMLIR(MlirModule, MlirCtx);
       assert(OutputStream && "No output stream when lowering to MLIR!");
       // FIXME: we cannot roundtrip prettyForm=true right now.
       mlir::OpPrintingFlags Flags;

clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp

@@ -48,15 +48,15 @@ class CIRGlobalOpLowering : public mlir::OpConversionPattern<cir::GlobalOp> {
   mlir::LogicalResult
   matchAndRewrite(cir::GlobalOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
-    auto moduleOp = op->getParentOfType<mlir::ModuleOp>();
+    mlir::ModuleOp moduleOp = op->getParentOfType<mlir::ModuleOp>();
     if (!moduleOp)
       return mlir::failure();
 
     mlir::OpBuilder b(moduleOp.getContext());
 
-    const auto cirSymType = op.getSymType();
+    const mlir::Type cirSymType = op.getSymType();
     assert(!cir::MissingFeatures::convertTypeForMemory());
-    auto convertedType = getTypeConverter()->convertType(cirSymType);
+    mlir::Type convertedType = getTypeConverter()->convertType(cirSymType);
     if (!convertedType)
       return mlir::failure();
     auto memrefType = dyn_cast<mlir::MemRefType>(convertedType);
@@ -156,9 +156,9 @@ static mlir::TypeConverter prepareTypeConverter() {
 }
 
 void ConvertCIRToMLIRPass::runOnOperation() {
-  auto module = getOperation();
+  mlir::ModuleOp module = getOperation();
 
-  auto converter = prepareTypeConverter();
+  mlir::TypeConverter converter = prepareTypeConverter();
 
   mlir::RewritePatternSet patterns(&getContext());
 
@@ -185,7 +185,7 @@ mlir::ModuleOp lowerFromCIRToMLIR(mlir::ModuleOp mlirModule,
 
   pm.addPass(createConvertCIRToMLIRPass());
 
-  auto result = !mlir::failed(pm.run(mlirModule));
+  bool result = !mlir::failed(pm.run(mlirModule));
   if (!result)
     llvm::report_fatal_error(
         "The pass manager failed to lower CIR to MLIR standard dialects!");