force copy constructor working

Author: anderslanglands

astgen/src/astgen.cpp

@@ -208,6 +208,8 @@ int main(int argc_, const char** argv_) {
 #define CPPMM_PROPERTIES(x) __attribute__((annotate("cppmm|properties|" #x)))
 #define CPPMM_MANUAL __attribute__((annotate("cppmm|manual")))
 #define CPPMM_IMPL __attribute__((annotate("cppmm|impl")))
+#define CPPMM_COPY_CTOR __attribute__((annotate("cppmm|copy_constructor")))
+#define CPPMM_MOVE_CTOR __attribute__((annotate("cppmm|move_constructor")))
 
 #define CPPMM_THROWS(EX, VAR) __attribute__((annotate("cppmm|throws|" #EX "|" #VAR)))
 #define CPPMM_NOEXCEPT __attribute__((annotate("cppmm|noexcept")))

astgen/src/process_binding.cpp

@@ -455,6 +455,16 @@ bool has_noexcept_attr(const std::vector<std::string>& attrs) {
            attrs.end();
 }
 
+bool has_copy_ctor_attr(const std::vector<std::string>& attrs) {
+    return std::find(attrs.begin(), attrs.end(), "cppmm|copy_constructor") !=
+           attrs.end();
+}
+
+bool has_move_ctor_attr(const std::vector<std::string>& attrs) {
+    return std::find(attrs.begin(), attrs.end(), "cppmm|move_constructor") !=
+           attrs.end();
+}
+
 bool has_manual_attr(const std::vector<std::string>& attrs) {
     return std::find(attrs.begin(), attrs.end(), "cppmm|manual") != attrs.end();
 }
@@ -1055,17 +1065,63 @@ bool is_public_move_ctor(const Decl* cmd) {
     }
 }
 
+bool has_forbidden_copy_ctor(const CXXRecordDecl* crd) {
+    for (const Decl* d: crd->decls()) {
+        if (is_inaccessible_copy_ctor(d)) {
+            return true;
+        }
+    }
+
+
+    for (const auto base : crd->bases()) {
+        if (const CXXRecordDecl* base_crd =
+                base.getType()->getAsCXXRecordDecl()) {
+            if (has_forbidden_copy_ctor(base_crd)) {
+                return true;
+            }
+        }
+    }
+    
+    return false;
+}
+
+bool has_forbidden_move_ctor(const CXXRecordDecl* crd) {
+    for (const Decl* d: crd->decls()) {
+        if (is_inaccessible_move_ctor(d)) {
+            return true;
+        }
+    }
+
+
+    for (const auto base : crd->bases()) {
+        if (const CXXRecordDecl* base_crd =
+                base.getType()->getAsCXXRecordDecl()) {
+            if (has_forbidden_move_ctor(base_crd)) {
+                return true;
+            }
+        }
+    }
+    
+    return false;
+}
+
 void has_public_copy_move_ctor(const CXXRecordDecl* crd,
                                bool& has_public_copy_ctor,
                                bool& has_public_move_ctor) {
-    for (const Decl* d : crd->decls()) {
-        // has_public_copy_ctor |= is_public_copy_ctor(d);
-        // has_public_move_ctor |= is_public_move_ctor(d);
-        has_public_copy_ctor |= is_inaccessible_copy_ctor(d);
-        has_public_move_ctor |= is_inaccessible_move_ctor(d);
-    }
-    has_public_copy_ctor = !has_public_copy_ctor;
-    has_public_move_ctor = !has_public_move_ctor;
+    // for (const Decl* d : crd->decls()) {
+    //     // has_public_copy_ctor |= is_public_copy_ctor(d);
+    //     // has_public_move_ctor |= is_public_move_ctor(d);
+    //     has_public_copy_ctor |= is_inaccessible_copy_ctor(d);
+    //     has_public_move_ctor |= is_inaccessible_move_ctor(d);
+    // }
+    // has_public_copy_ctor = !has_public_copy_ctor;
+    // has_public_move_ctor = !has_public_move_ctor;
+
+    // has_public_copy_ctor = crd->hasTrivialCopyConstructor() || crd->hasNonTrivialCopyConstructor();
+    has_public_move_ctor = (crd->hasTrivialMoveConstructor() || crd->hasNonTrivialMoveConstructor()) && !has_forbidden_move_ctor(crd);
+
+    has_public_copy_ctor = !has_forbidden_copy_ctor(crd);
+    // has_public_move_ctor = !has_forbidden_move_ctor(crd);
 }
 
 std::vector<std::string> get_properties(const std::vector<std::string>& attrs) {
@@ -1226,6 +1282,9 @@ void process_concrete_record(const CXXRecordDecl* crd, std::string filename,
                 mptr->is_noexcept |= has_noexcept_attr(mptr->attrs);
                 function_map[mptr->_function_id] = mptr;
 
+                mptr->is_copy_constructor = has_copy_ctor_attr(mptr->attrs);
+                mptr->is_move_constructor = has_move_ctor_attr(mptr->attrs);
+
                 NodeId id = NODES.size();
                 NODE_MAP[method->qualified_name] = id;
                 NODES.emplace_back(std::move(method));

test/copymoveaccess/bind/cma.cpp

@@ -5,9 +5,14 @@ namespace cppmm_bind {
 
 namespace foo {
 
-class PublicDerived { using BoundType = ::foo::PublicDerived; };
-class PrivateDerived { using BoundType = ::foo::PrivateDerived; };
-class DeletedDerived { using BoundType = ::foo::DeletedDerived; };
+struct PublicDerived { 
+    using BoundType = ::foo::PublicDerived; 
+
+    PublicDerived(const ::foo::PublicDerived&) CPPMM_MANUAL CPPMM_COPY_CTOR;
+};
+
+// class PrivateDerived { using BoundType = ::foo::PrivateDerived; };
+// class DeletedDerived { using BoundType = ::foo::DeletedDerived; };
 
 }
 

test/copymoveaccess/include/cma.hpp

@@ -4,9 +4,9 @@ namespace foo {
 
 class PublicBase {
 public:
-    PublicBase(){}
-    PublicBase(const PublicBase&){};
-    PublicBase(PublicBase&&){};
+    // PublicBase(){}
+    // PublicBase(const PublicBase&){};
+    // PublicBase(PublicBase&&){};
 };
 
 class PrivateBase {