Handle anonymous structs inside records

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2837,10 +2837,6 @@ std::string Converter::GetRecordName(const clang::NamedDecl *decl) const {
   if (auto it = inner_structs_.find(ID); it != inner_structs_.end()) {
     return it->second;
   }
-  if (auto *record = clang::dyn_cast<clang::RecordDecl>(decl);
-      record && !record->getIdentifier()) {
-    return ID;
-  }
   return std::regex_replace(Mapper::ToString(decl), std::regex("::"), "_");
 }
 

cpp2rust/converter/converter_lib.cpp

@@ -10,6 +10,7 @@
 
 #include <array>
 #include <filesystem>
+#include <format>
 #include <unordered_set>
 
 #include "converter/lex.h"
@@ -294,6 +295,25 @@ unsigned GetArraySize(clang::QualType array_type) {
   return constant_array_ty->getSize().getZExtValue();
 }
 
+unsigned GetAnonIndex(const clang::NamedDecl *decl) {
+  if (auto *parent =
+          clang::dyn_cast<clang::RecordDecl>(decl->getDeclContext())) {
+    unsigned counter = 0;
+    for (auto *d : parent->decls()) {
+      if (d == decl) {
+        return counter;
+      }
+      auto *named = clang::dyn_cast<clang::NamedDecl>(d);
+      if (named && named->getKind() == decl->getKind() &&
+          named->getName().empty()) {
+        counter++;
+      }
+    }
+    return counter;
+  }
+  return 0;
+}
+
 std::string GetID(const clang::Decl *decl) {
   assert(decl);
   const auto file_name = GetFileName(decl);
@@ -315,6 +335,11 @@ std::string GetNamedDeclAsString(const clang::NamedDecl *decl) {
   auto name = decl->getDeclName().isIdentifier() ? decl->getName().str()
                                                  : decl->getNameAsString();
 
+  if (auto *field = clang::dyn_cast<clang::FieldDecl>(decl);
+      field && name.empty()) {
+    return std::format("anon_{}", GetAnonIndex(field));
+  }
+
   if (auto *fn = clang::dyn_cast<clang::FunctionDecl>(decl)) {
     if (!clang::isa<clang::CXXMethodDecl>(fn)) {
       auto mangled =

cpp2rust/converter/converter_lib.h

@@ -81,6 +81,8 @@ std::string GetID(const clang::Decl *decl);
 
 std::string GetNamedDeclAsString(const clang::NamedDecl *decl);
 
+unsigned GetAnonIndex(const clang::NamedDecl *decl);
+
 const char *AccessSpecifierAsString(clang::AccessSpecifier spec);
 
 template <class T> llvm::SmallString<16> GetNumAsString(const T &num) {

cpp2rust/converter/mapper.cpp

@@ -8,6 +8,7 @@
 #include <llvm/Support/ThreadPool.h>
 
 #include <atomic>
+#include <format>
 #include <mutex>
 #include <regex>
 #include <utility>
@@ -713,7 +714,23 @@ std::string ToString(clang::QualType qual_type) {
   return normalizeTranslationRule(type);
 }
 
+static std::string synthesizeAnonRecordName(const clang::RecordDecl *record) {
+  std::string parent_name;
+  if (auto *parent =
+          clang::dyn_cast<clang::RecordDecl>(record->getDeclContext())) {
+    parent_name =
+        parent->getIdentifier() ? parent->getIdentifier()->getName().str();
+                      : synthesizeAnonRecordName(parent);
+  }
+  return std::format("{}_anon_{}", parent_name, GetAnonIndex(record));
+}
+
 std::string ToString(const clang::NamedDecl *decl) {
+  if (auto *record = clang::dyn_cast<clang::RecordDecl>(decl);
+      record && !record->getIdentifier()) {
+    return synthesizeAnonRecordName(record);
+  }
+
   std::string out;
   llvm::raw_string_ostream os(out);