Make GetStructAttributes receive a RecordDecl

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -519,9 +519,11 @@ bool IsPointerType(clang::QualType qual_type) {
                             ->getCanonicalTypeInternal()));
 }
 
-bool Converter::RecordDerivesDefault(const clang::CXXRecordDecl *decl) {
-  if (GetUserDefinedDefaultConstructor(decl)) {
-    return false;
+bool Converter::RecordDerivesDefault(const clang::RecordDecl *decl) {
+  if (auto cxx_decl = clang::dyn_cast<clang::CXXRecordDecl>(decl)) {
+    if (GetUserDefinedDefaultConstructor(cxx_decl)) {
+      return false;
+    }
   }
 
   for (auto f : decl->fields()) {
@@ -546,7 +548,7 @@ bool Converter::RecordDerivesDefault(const clang::CXXRecordDecl *decl) {
   return true;
 }
 
-static bool recordDerivesCopy(const clang::CXXRecordDecl *decl) {
+static bool recordDerivesCopy(const clang::RecordDecl *decl) {
   for (auto f : decl->fields()) {
     // Records that contain std::vector, std::array, std::string or anything
     // that is translated to Vec<>, do not derive Copy
@@ -569,8 +571,8 @@ static bool recordDerivesCopy(const clang::CXXRecordDecl *decl) {
       }
     }
 
-    // Look recursively into fields that are CXXRecordDecl
-    if (auto field_record = f->getType()->getAsCXXRecordDecl()) {
+    // Look recursively into fields that are RecordDecl
+    if (auto field_record = f->getType()->getAsRecordDecl()) {
       if (!recordDerivesCopy(field_record)) {
         return false;
       }
@@ -629,12 +631,8 @@ void Converter::EmitRustStruct(clang::RecordDecl *decl) {
 
   // Derived traits
   StrCat("#[derive(");
-  if (auto *cxx = clang::dyn_cast<clang::CXXRecordDecl>(decl)) {
-    for (auto *attr : GetStructAttributes(cxx)) {
-      StrCat(attr, ",");
-    }
-  } else {
-    StrCat("Clone, Default");
+  for (auto *attr : GetStructAttributes(decl)) {
+    StrCat(attr, ",");
   }
   StrCat(")]");
 
@@ -2837,14 +2835,18 @@ std::string Converter::GetRecordName(const clang::NamedDecl *decl) const {
 }
 
 std::vector<const char *>
-Converter::GetStructAttributes(const clang::CXXRecordDecl *decl) {
+Converter::GetStructAttributes(const clang::RecordDecl *decl) {
   std::vector<const char *> struct_attrs = {};
 
   if (recordDerivesCopy(decl)) {
     struct_attrs.emplace_back("Copy");
   }
 
-  if (!decl->defaultedCopyConstructorIsDeleted()) {
+  if (auto cxx_decl = clang::dyn_cast<clang::CXXRecordDecl>(decl)) {
+    if (!cxx_decl->defaultedCopyConstructorIsDeleted()) {
+      struct_attrs.emplace_back("Clone");
+    }
+  } else /* RecordDecl */ {
     struct_attrs.emplace_back("Clone");
   }
 

cpp2rust/converter/converter.h

@@ -359,7 +359,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   virtual std::string GetRecordName(const clang::NamedDecl *decl) const;
 
   virtual std::vector<const char *>
-  GetStructAttributes(const clang::CXXRecordDecl *decl);
+  GetStructAttributes(const clang::RecordDecl *decl);
 
   virtual std::string GetUnsafeTypeAsString(clang::QualType qual_type) const;
 
@@ -457,7 +457,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual bool IsReferenceType(const clang::Expr *expr) const;
 
-  virtual bool RecordDerivesDefault(const clang::CXXRecordDecl *decl);
+  virtual bool RecordDerivesDefault(const clang::RecordDecl *decl);
 
   std::string *rs_code_;
   clang::ASTContext &ctx_;

cpp2rust/converter/models/converter_refcount.cpp

@@ -1604,7 +1604,7 @@ ConverterRefCount::ConvertVarDefaultInit(clang::QualType qual_type) {
 }
 
 std::vector<const char *>
-ConverterRefCount::GetStructAttributes(const clang::CXXRecordDecl *decl) {
+ConverterRefCount::GetStructAttributes(const clang::RecordDecl *decl) {
   std::vector<const char *> attrs = {};
 
   if (RecordDerivesDefault(decl)) {

cpp2rust/converter/models/converter_refcount.h

@@ -121,7 +121,7 @@ class ConverterRefCount final : public Converter {
   std::string ConvertVarDefaultInit(clang::QualType qual_type) override;
 
   std::vector<const char *>
-  GetStructAttributes(const clang::CXXRecordDecl *decl) override;
+  GetStructAttributes(const clang::RecordDecl *decl) override;
 
   bool MayCauseBorrowMutError(const clang::Expr *lhs, const clang::Expr *rhs);