review comments & add cir-opt

Author: bruteforceboy

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

@@ -1301,17 +1301,22 @@ def GlobalDtorAttr : CIR_GlobalCtorDtor<"Dtor", "dtor",
   "A function with this attribute excutes before module unloading"
 >;
 
-class CIR_CXXSpecialMember<string name, string attrMnemonic, string sum,
-                           string desc> : CIR_Attr<name, attrMnemonic> {
+class CIR_CXXSpecialMember<string name, string attrMnemonic, string sum>
+                            : CIR_Attr<name, attrMnemonic> {
   let summary = sum;
-  let description = desc;
   let skipDefaultBuilders = 1;
 }
 
 def CXXCtorAttr
     : CIR_CXXSpecialMember<
-          "CXXCtor", "cxx_ctor", "Marks a function as a CXX constructor",
-          "Functions with this attribute are CXX constructors"> {
+          "CXXCtor", "cxx_ctor", "Marks a function as a CXX constructor"> {
+  let description = [{
+    Functions with this attribute are CXX constructors.
+    The `is_default_constructor` parameter is a boolean which is set to
+    true if the constructor is a default constructor and false otherwise.
+    The `is_copy_constructor` parameter is a boolean which is set to
+    true if the constructor is a copy constructor and false otherwise.
+  }];
   let parameters = (ins "mlir::Type":$type,
                         "bool":$is_default_constructor,
                         "bool":$is_copy_constructor);
@@ -1337,8 +1342,10 @@ def CXXCtorAttr
 
 def CXXDtorAttr
     : CIR_CXXSpecialMember<
-          "CXXDtor", "cxx_dtor", "Marks a function as a CXX destructor",
-          "Functions with this attribute are CXX destructors"> {
+          "CXXDtor", "cxx_dtor", "Marks a function as a CXX destructor"> {
+  let description = [{
+    Functions with this attribute are CXX destructors
+  }];
   let parameters = (ins "mlir::Type":$type);
   let assemblyFormat = [{
     `<`

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

@@ -2457,11 +2457,14 @@ ParseResult cir::FuncOp::parse(OpAsmParser &parser, OperationState &state) {
     bool defaultCtor = false, copyCtor = false;
     if (parser.parseType(type).failed())
       return failure();
-    if (mlir::succeeded(parser.parseOptionalComma()))
-      if (mlir::succeeded(parser.parseOptionalKeyword("default_ctor")))
+    if (mlir::succeeded(parser.parseOptionalComma())) {
+      if (mlir::succeeded(parser.parseOptionalKeyword("default")))
         defaultCtor = true;
+      if (mlir::succeeded(parser.parseOptionalKeyword("copy")))
+        copyCtor = true;
+    }
     if (mlir::succeeded(parser.parseOptionalComma()))
-      if (mlir::succeeded(parser.parseOptionalKeyword("copy_ctor")))
+      if (mlir::succeeded(parser.parseOptionalKeyword("copy")))
         copyCtor = true;
     if (parser.parseGreater().failed())
       return failure();
@@ -2666,9 +2669,9 @@ void cir::FuncOp::print(OpAsmPrinter &p) {
   if (auto cxxCtor = getCxxCtorAttr()) {
     p << " ctor<" << cxxCtor.getType();
     if (cxxCtor.getIsDefaultConstructor())
-      p << ", default_ctor";
+      p << ", default";
     if (cxxCtor.getIsCopyConstructor())
-      p << ", copy_ctor";
+      p << ", copy";
     p << '>';
   }
 

clang/test/CIR/CodeGen/ctor-alias.cpp

@@ -37,4 +37,4 @@ B::B() {
 // CHECK:   %1 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_B>>, !cir.ptr<!rec_B>
 // CHECK:   cir.return
 // CHECK: }
-// CHECK: cir.func private dso_local @_ZN1BC1Ev(!cir.ptr<!rec_B>) ctor<!rec_B, default_ctor> alias(@_ZN1BC2Ev)
+// CHECK: cir.func private dso_local @_ZN1BC1Ev(!cir.ptr<!rec_B>) ctor<!rec_B, default> alias(@_ZN1BC2Ev)

clang/test/CIR/CodeGen/temporaries.cpp

@@ -14,7 +14,7 @@ void f() {
   !E();
 }
 
-//      CIR: cir.func private @_ZN1EC1Ev(!cir.ptr<!rec_E>) ctor<!rec_E, default_ctor> extra(#fn_attr)
+//      CIR: cir.func private @_ZN1EC1Ev(!cir.ptr<!rec_E>) ctor<!rec_E, default> extra(#fn_attr)
 // CIR-NEXT: cir.func private @_ZN1EntEv(!cir.ptr<!rec_E>) -> !rec_E
 // CIR-NEXT: cir.func private @_ZN1ED1Ev(!cir.ptr<!rec_E>) dtor<!rec_E> extra(#fn_attr)
 // CIR-NEXT: cir.func dso_local @_Z1fv() extra(#fn_attr1) {

clang/test/CIR/IR/cxx-special-member.cir

@@ -0,0 +1,10 @@
+// RUN: cir-opt %s
+
+!s32i = !cir.int<s, 32>
+!rec_S = !cir.record<struct "S" {!s32i}>
+module {
+  cir.func private @_ZN1SC1ERKS_(!cir.ptr<!rec_S>, !cir.ptr<!rec_S>) ctor<!rec_S, copy>
+  cir.func private @_ZN1SC2Ei(!cir.ptr<!rec_S>, !cir.ptr<!rec_S>) ctor<!rec_S>
+  cir.func private @_ZN1SC2Ev(!cir.ptr<!rec_S>) ctor<!rec_S, default>
+  cir.func private @_ZN1SD2Ev(!cir.ptr<!rec_S>) dtor<!rec_S>
+}