refactor

Author: bruteforceboy

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

@@ -1299,7 +1299,7 @@ def CIR_CXXCtorAttr : CIR_Attr<"CXXCtor", "cxx_ctor"> {
     AttrBuilderWithInferredContext<(ins "mlir::Type":$type,
         CArg<"CtorKind", "cir::CtorKind::Custom">:$ctorKind,
         CArg<"std::optional<const clang::CXXRecordDecl *>",
-             "std::nullopt">:$recordDecl), [{
+        "std::nullopt">:$recordDecl), [{
       return $_get(type.getContext(), type, ctorKind, recordDecl);
     }]>
   ];
@@ -1310,27 +1310,18 @@ def CIR_CXXDtorAttr : CIR_Attr<"CXXDtor", "cxx_dtor"> {
   let description = [{
     Functions with this attribute are CXX destructors
   }];
-<<<<<<< HEAD
   let parameters = (ins "mlir::Type":$type,
     OptionalParameter<"std::optional<const clang::CXXRecordDecl *>">:$recordDecl);
-=======
-  let parameters = (ins "mlir::Type":$type);
->>>>>>> origin/main
 
   let assemblyFormat = [{
     `<` $type `>`
   }];
 
   let builders = [
-<<<<<<< HEAD
     AttrBuilderWithInferredContext<(ins "mlir::Type":$type,
         CArg<"std::optional<const clang::CXXRecordDecl *>",
-             "std::nullopt">:$recordDecl), [{
+        "std::nullopt">:$recordDecl), [{
       return $_get(type.getContext(), type, recordDecl);
-=======
-    AttrBuilderWithInferredContext<(ins "mlir::Type":$type), [{
-      return $_get(type.getContext(), type);
->>>>>>> origin/main
     }]>
   ];
 }

clang/test/CIR/Inputs/std-cxx.h

@@ -288,13 +288,13 @@ namespace std {
     typedef __vector_iterator<T, T *, T &> iterator;
     typedef __vector_iterator<T, const T *, const T &> const_iterator;
 
-    vector() : _start(0), _finish(0), _end_of_storage(0) {} // expected-remark {{found call to std::vector_cxx_ctor()}}
+    vector() : _start(0), _finish(0), _end_of_storage(0) {}
     template <typename InputIterator>
     vector(InputIterator first, InputIterator last);
     vector(const vector &other);
     vector(vector &&other);
     explicit vector(size_type count);
-    ~vector(); // expected-remark{{found call to std::vector_cxx_dtor()}}
+    ~vector();
 
     size_t size() const {
       return size_t(_finish - _start);

clang/test/CIR/Transforms/idiom-recognizer.cpp

@@ -47,14 +47,3 @@ void iter_test() {
   yolo::array<unsigned char, 3> v = {1, 2, 3};
   (void)v.begin(); // no remark should be produced.
 }
-
-void vector_test() {
-  std::vector<int> v; // expected-remark {{found call to std::vector_cxx_ctor()}}
-
-  // BEFORE-IDIOM: cir.call @_ZNSt6vectorIiEC1Ev(
-  // BEFORE-IDIOM: cir.call @_ZNSt6vectorIiED1Ev(
-  // AFTER-IDIOM: cir.std.vector_cxx_ctor(
-  // AFTER-IDIOM: cir.std.vector_cxx_dtor(
-  // AFTER-LOWERING-PREPARE: cir.call @_ZNSt6vectorIiEC1Ev(
-  // AFTER-LOWERING-PREPARE: cir.call @_ZNSt6vectorIiED1Ev(
-}

clang/test/CIR/Transforms/idiom-vector.cpp

@@ -0,0 +1,27 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -fclangir-idiom-recognizer -emit-cir -I%S/../Inputs -mmlir --mlir-print-ir-after-all %s -o - 2>&1 | FileCheck %s -check-prefix=PASS_ENABLED
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -emit-cir -I%S/../Inputs -fclangir-idiom-recognizer="remarks=found-calls" -clangir-verify-diagnostics %s -o %t.cir
+
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -fclangir-idiom-recognizer -emit-cir -I%S/../Inputs -mmlir --mlir-print-ir-before=cir-idiom-recognizer %s -o - 2>&1 | FileCheck %s -check-prefix=BEFORE-IDIOM
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -fclangir-idiom-recognizer -emit-cir -I%S/../Inputs -mmlir --mlir-print-ir-after=cir-idiom-recognizer %s -o - 2>&1 | FileCheck %s -check-prefix=AFTER-IDIOM
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -fclangir-idiom-recognizer -emit-cir -I%S/../Inputs -mmlir --mlir-print-ir-after=cir-lowering-prepare %s -o - 2>&1 | FileCheck %s -check-prefix=AFTER-LOWERING-PREPARE
+
+// PASS_ENABLED:  IR Dump After IdiomRecognizer (cir-idiom-recognizer)
+
+namespace std {
+template <typename T> class vector {
+public:
+  vector() {}   // expected-remark {{found call to std::vector_cxx_ctor()}}
+  ~vector() {}; // expected-remark{{found call to std::vector_cxx_dtor()}}
+};
+
+void vector_test() {
+  vector<int> v; // expected-remark {{found call to std::vector_cxx_ctor()}}
+
+  // BEFORE-IDIOM: cir.call @_ZNSt6vectorIiEC1Ev(
+  // BEFORE-IDIOM: cir.call @_ZNSt6vectorIiED1Ev(
+  // AFTER-IDIOM: cir.std.vector_cxx_ctor(
+  // AFTER-IDIOM: cir.std.vector_cxx_dtor(
+  // AFTER-LOWERING-PREPARE: cir.call @_ZNSt6vectorIiEC1Ev(
+  // AFTER-LOWERING-PREPARE: cir.call @_ZNSt6vectorIiED1Ev(
+}
+}; // namespace std