Address review feedback

Author: andykaylor

clang/include/clang/CIR/CIRGenerator.h

@@ -44,7 +44,7 @@ class CIRGenerator : public clang::ASTConsumer {
   const clang::CodeGenOptions &codeGenOpts;
 
 protected:
-  std::shared_ptr<mlir::MLIRContext> mlirContext;
+  std::unique_ptr<mlir::MLIRContext> mlirContext;
   std::unique_ptr<clang::CIRGen::CIRGenModule> cgm;
 
 public:
@@ -55,9 +55,6 @@ class CIRGenerator : public clang::ASTConsumer {
   void Initialize(clang::ASTContext &astContext) override;
   bool HandleTopLevelDecl(clang::DeclGroupRef group) override;
   mlir::ModuleOp getModule() const;
-  std::shared_ptr<mlir::MLIRContext> getContext() {
-    return mlirContext;
-  };
 };
 
 } // namespace cir

clang/lib/CIR/CodeGen/CIRGenerator.cpp

@@ -34,7 +34,7 @@ void CIRGenerator::Initialize(ASTContext &astContext) {
 
   this->astContext = &astContext;
 
-  mlirContext = std::make_shared<mlir::MLIRContext>();
+  mlirContext = std::make_unique<mlir::MLIRContext>();
   mlirContext->loadDialect<cir::CIRDialect>();
   cgm = std::make_unique<clang::CIRGen::CIRGenModule>(
       *mlirContext.get(), astContext, codeGenOpts, diags);

clang/lib/CIR/FrontendAction/CIRGenAction.cpp

@@ -23,16 +23,20 @@ namespace cir {
 static BackendAction
 getBackendActionFromOutputType(CIRGenAction::OutputType Action) {
   switch (Action) {
+  case CIRGenAction::OutputType::EmitCIR:
+    assert(false &&
+           "Unsupported output type for getBackendActionFromOutputType!");
+    break; // Unreachable, but fall through to report that
   case CIRGenAction::OutputType::EmitLLVM:
     return BackendAction::Backend_EmitLL;
-  default:
-    llvm_unreachable("Unsupported action");
   }
+  // We should only get here if a non-enum value is passed in or we went through
+  // the assert(false) case above
+  llvm_unreachable("Unsupported output type!");
 }
 
-static std::unique_ptr<llvm::Module> lowerFromCIRToLLVMIR(
-    const clang::FrontendOptions &FEOpts, mlir::ModuleOp MLIRModule,
-    std::shared_ptr<mlir::MLIRContext> MLIRCtx, llvm::LLVMContext &LLVMCtx) {
+static std::unique_ptr<llvm::Module>
+lowerFromCIRToLLVMIR(mlir::ModuleOp MLIRModule, llvm::LLVMContext &LLVMCtx) {
   return direct::lowerDirectlyFromCIRToLLVMIR(MLIRModule, LLVMCtx);
 }
 
@@ -72,7 +76,6 @@ class CIRGenConsumer : public clang::ASTConsumer {
   void HandleTranslationUnit(ASTContext &C) override {
     Gen->HandleTranslationUnit(C);
     mlir::ModuleOp MlirModule = Gen->getModule();
-    std::shared_ptr<mlir::MLIRContext> MLIRCtx = Gen->getContext();
     switch (Action) {
     case CIRGenAction::OutputType::EmitCIR:
       if (OutputStream && MlirModule) {
@@ -83,8 +86,8 @@ class CIRGenConsumer : public clang::ASTConsumer {
       break;
     case CIRGenAction::OutputType::EmitLLVM: {
       llvm::LLVMContext LLVMCtx;
-      auto LLVMModule = lowerFromCIRToLLVMIR(CI.getFrontendOpts(), MlirModule,
-                                             MLIRCtx, LLVMCtx);
+      std::unique_ptr<llvm::Module> LLVMModule =
+          lowerFromCIRToLLVMIR(MlirModule, LLVMCtx);
 
       BackendAction BEAction = getBackendActionFromOutputType(Action);
       emitBackendOutput(

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -13,8 +13,6 @@
 #include "clang/CIR/LowerToLLVM.h"
 
 #include "mlir/IR/BuiltinOps.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Pass/PassManager.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/TimeProfiler.h"