Feedback

Author: HendrikHuebner

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -2229,6 +2229,24 @@ CIRGenModule::createCIRBuiltinFunction(mlir::Location loc, StringRef name,
   return fnOp;
 }
 
+static cir::CtorKind getCtorKindFromDecl(const CXXConstructorDecl *ctor) {
+  if (ctor->isDefaultConstructor())
+    return cir::CtorKind::Default;
+  if (ctor->isCopyConstructor())
+    return cir::CtorKind::Copy;
+  if (ctor->isMoveConstructor())
+    return cir::CtorKind::Move;
+  return cir::CtorKind::Custom;
+}
+
+static cir::AssignKind getAssignKindFromDecl(const CXXMethodDecl *method) {
+  if (method->isCopyAssignmentOperator())
+    return cir::AssignKind::Copy;
+  if (method->isMoveAssignmentOperator())
+    return cir::AssignKind::Move;
+  llvm_unreachable("not a copy or move assignment operator");
+}
+
 void CIRGenModule::setCXXSpecialMemberAttr(
     cir::FuncOp funcOp, const clang::FunctionDecl *funcDecl) {
   if (!funcDecl)
@@ -2243,32 +2261,18 @@ void CIRGenModule::setCXXSpecialMemberAttr(
   }
 
   if (const auto *ctor = dyn_cast<CXXConstructorDecl>(funcDecl)) {
-    cir::CtorKind ctorKind = cir::CtorKind::Custom;
-    if (ctor->isDefaultConstructor())
-      ctorKind = cir::CtorKind::Default;
-    else if (ctor->isCopyConstructor())
-      ctorKind = cir::CtorKind::Copy;
-    else if (ctor->isMoveConstructor())
-      ctorKind = cir::CtorKind::Move;
-
+    cir::CtorKind kind = getCtorKindFromDecl(ctor);
     auto cxxCtor = cir::CXXCtorAttr::get(
         convertType(getASTContext().getCanonicalTagType(ctor->getParent())),
-        ctorKind, ctor->isTrivial());
+        kind, ctor->isTrivial());
     funcOp.setCxxSpecialMemberAttr(cxxCtor);
     return;
   }
 
   const auto *method = dyn_cast<CXXMethodDecl>(funcDecl);
   if (method && (method->isCopyAssignmentOperator() ||
                  method->isMoveAssignmentOperator())) {
-    cir::AssignKind assignKind;
-    if (method->isCopyAssignmentOperator())
-      assignKind = cir::AssignKind::Copy;
-    else if (method->isMoveAssignmentOperator())
-      assignKind = cir::AssignKind::Move;
-    else
-      llvm_unreachable("unexpected assignment operator kind");
-
+    cir::AssignKind assignKind = getAssignKindFromDecl(method);
     auto cxxAssign = cir::CXXAssignAttr::get(
         convertType(getASTContext().getCanonicalTagType(method->getParent())),
         assignKind, method->isTrivial());