update

Author: bruteforceboy

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -764,16 +764,14 @@ cir::FuncOp CIRGenFunction::generateCode(clang::GlobalDecl gd, cir::FuncOp fn,
     // Generate the body of the function.
     // TODO: PGO.assignRegionCounters
     assert(!cir::MissingFeatures::shouldInstrumentFunction());
-    if (isa<CXXDestructorDecl>(fd)) {
-      auto dtor = dyn_cast<CXXDestructorDecl>(fd);
+    if (auto dtor = dyn_cast<CXXDestructorDecl>(fd)) {
       auto cxxDtor = cir::CXXDtorAttr::get(
           &getMLIRContext(),
           convertType(getContext().getRecordType(dtor->getParent())));
       fn.setCxxDtorAttr(cxxDtor);
 
       emitDestructorBody(args);
-    } else if (isa<CXXConstructorDecl>(fd)) {
-      auto ctor = dyn_cast<CXXConstructorDecl>(fd);
+    } else if (auto ctor = dyn_cast<CXXConstructorDecl>(fd)) {
       auto cxxCtor = cir::CXXCtorAttr::get(
           &getMLIRContext(),
           convertType(getContext().getRecordType(ctor->getParent())),

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -2742,16 +2742,14 @@ cir::FuncOp CIRGenModule::createCIRFunction(mlir::Location loc, StringRef name,
     if (fd) {
       CIRGenFunction cgf{*this, builder};
 
-      if (isa<CXXDestructorDecl>(fd)) {
-        auto dtor = dyn_cast<CXXDestructorDecl>(fd);
+      if (auto dtor = dyn_cast<CXXDestructorDecl>(fd)) {
         auto cxxDtor = cir::CXXDtorAttr::get(
             &getMLIRContext(),
             convertType(cgf.getContext().getRecordType(dtor->getParent())));
         f.setCxxDtorAttr(cxxDtor);
       }
 
-      if (isa<CXXConstructorDecl>(fd)) {
-        auto ctor = dyn_cast<CXXConstructorDecl>(fd);
+      if (auto ctor = dyn_cast<CXXConstructorDecl>(fd)) {
         auto cxxCtor = cir::CXXCtorAttr::get(
             &getMLIRContext(),
             convertType(cgf.getContext().getRecordType(ctor->getParent())),

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -2679,14 +2679,16 @@ void cir::FuncOp::print(OpAsmPrinter &p) {
   function_interface_impl::printFunctionAttributes(
       p, *this,
       // These are all omitted since they are custom printed already.
-      {getAliaseeAttrName(), getBuiltinAttrName(), getCoroutineAttrName(),
-       getDsoLocalAttrName(), getExtraAttrsAttrName(),
-       getFunctionTypeAttrName(), getGlobalCtorAttrName(),
-       getGlobalDtorAttrName(), getLambdaAttrName(), getLinkageAttrName(),
-       getCallingConvAttrName(), getNoProtoAttrName(),
-       getSymVisibilityAttrName(), getArgAttrsAttrName(), getResAttrsAttrName(),
-       getComdatAttrName(), getGlobalVisibilityAttrName(),
-       getAnnotationsAttrName(), getCxxCtorAttrName(), getCxxDtorAttrName()});
+      {getAliaseeAttrName(),          getBuiltinAttrName(),
+       getCoroutineAttrName(),        getDsoLocalAttrName(),
+       getExtraAttrsAttrName(),       getFunctionTypeAttrName(),
+       getGlobalCtorAttrName(),       getGlobalDtorAttrName(),
+       getLambdaAttrName(),           getLinkageAttrName(),
+       getCallingConvAttrName(),      getNoProtoAttrName(),
+       getSymVisibilityAttrName(),    getArgAttrsAttrName(),
+       getResAttrsAttrName(),         getComdatAttrName(),
+       getGlobalVisibilityAttrName(), getAnnotationsAttrName(),
+       getCxxCtorAttrName(),          getCxxDtorAttrName()});
 
   if (auto aliaseeName = getAliasee()) {
     p << " alias(";