Apply review feedback

Author: andykaylor

clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h

@@ -124,6 +124,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
   cir::ConstantOp getTrue(mlir::Location loc) { return getBool(true, loc); }
 
   cir::BoolType getBoolTy() { return cir::BoolType::get(getContext()); }
+  cir::VoidType getVoidTy() { return cir::VoidType::get(getContext()); }
 
   cir::PointerType getPointerTo(mlir::Type ty) {
     return cir::PointerType::get(ty);

clang/include/clang/CIR/Dialect/IR/CIRAttrs.h

@@ -20,10 +20,6 @@
 
 #include "clang/CIR/Interfaces/CIRTypeInterfaces.h"
 
-namespace cir {
-inline constexpr uint32_t DefaultGlobalCtorDtorPriority = 65535;
-} // namespace cir
-
 //===----------------------------------------------------------------------===//
 // CIR Dialect Attrs
 //===----------------------------------------------------------------------===//

clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp

@@ -634,8 +634,7 @@ LoweringPreparePass::buildCXXGlobalVarDeclInitFunc(cir::GlobalOp op) {
   // Create a variable initialization function.
   CIRBaseBuilderTy builder(getContext());
   builder.setInsertionPointAfter(op);
-  auto voidTy = cir::VoidType::get(builder.getContext());
-  auto fnType = cir::FuncType::get({}, voidTy);
+  auto fnType = cir::FuncType::get({}, builder.getVoidTy());
   FuncOp f = buildRuntimeFunction(builder, fnName, op.getLoc(), fnType,
                                   cir::GlobalLinkageKind::InternalLinkage);
 
@@ -648,7 +647,7 @@ LoweringPreparePass::buildCXXGlobalVarDeclInitFunc(cir::GlobalOp op) {
   }
 
   // Register the destructor call with __cxa_atexit
-  auto &dtorRegion = op.getDtorRegion();
+  mlir::Region &dtorRegion = op.getDtorRegion();
   if (!dtorRegion.empty()) {
     assert(!cir::MissingFeatures::opGlobalDtorLowering());
     llvm_unreachable("dtor region lowering is NYI");
@@ -666,7 +665,7 @@ LoweringPreparePass::buildCXXGlobalVarDeclInitFunc(cir::GlobalOp op) {
   }
 
   assert(isa<YieldOp>(*yieldOp));
-  builder.create<ReturnOp>(yieldOp->getLoc());
+  cir::ReturnOp::create(builder, yieldOp->getLoc());
   return f;
 }
 
@@ -716,16 +715,15 @@ void LoweringPreparePass::buildCXXGlobalInitFunc() {
 
   CIRBaseBuilderTy builder(getContext());
   builder.setInsertionPointToEnd(&mlirModule.getBodyRegion().back());
-  auto fnType =
-      cir::FuncType::get({}, cir::VoidType::get(builder.getContext()));
+  auto fnType = cir::FuncType::get({}, builder.getVoidTy());
   cir::FuncOp f =
       buildRuntimeFunction(builder, fnName, mlirModule.getLoc(), fnType,
                            cir::GlobalLinkageKind::ExternalLinkage);
   builder.setInsertionPointToStart(f.addEntryBlock());
   for (cir::FuncOp &f : dynamicInitializers)
     builder.createCallOp(f.getLoc(), f, {});
 
-  builder.create<ReturnOp>(f.getLoc());
+  cir::ReturnOp::create(builder, f.getLoc());
 }
 
 static void lowerArrayDtorCtorIntoLoop(cir::CIRBaseBuilderTy &builder,