Fix collision of anonymous enum names

Author: lucic71

cpp2rust/converter/converter_lib.cpp

@@ -408,9 +408,10 @@ std::string GetNamedDeclAsString(const clang::NamedDecl *decl) {
   auto name = decl->getDeclName().isIdentifier() ? decl->getName().str()
                                                  : decl->getNameAsString();
 
-  // Anonymous record
+  // Anonymous record or enum
   if (name.empty() && (clang::isa<clang::RecordDecl>(decl) ||
-                       clang::isa<clang::FieldDecl>(decl))) {
+                       clang::isa<clang::FieldDecl>(decl) ||
+                       clang::isa<clang::EnumDecl>(decl))) {
     const clang::NamedDecl *target = decl;
     if (auto *field = clang::dyn_cast<clang::FieldDecl>(decl)) {
       if (auto *record = field->getType()->getAsRecordDecl();

cpp2rust/converter/mapper.cpp

@@ -765,7 +765,7 @@ std::string ToString(const clang::NamedDecl *decl) {
     }
     if (!enum_decl->getIdentifier() &&
         !enum_decl->getTypedefNameForAnonDecl()) {
-      return std::format("anon_enum_{}", GetLineNumber(enum_decl));
+      return GetNamedDeclAsString(enum_decl);
     }
   }
 

tests/multi-file/cross_tu_anon_enum_collision/CMakeLists.txt

@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.16)
+project(cross_tu_anon_enum_collision LANGUAGES C)
+add_executable(app a.c b.c)

tests/multi-file/cross_tu_anon_enum_collision/a.c

@@ -0,0 +1,17 @@
+#include <assert.h>
+// anon enum below shares the same declaration line as b.c:enum { BETA = 9 }
+enum { ALPHA = 7 };
+
+int b_value(void);
+
+int a_value(void) {
+  int x = 0;
+  x |= ALPHA;
+  return x;
+}
+
+int main(void) {
+  assert(a_value() == 7);
+  assert(b_value() == 9);
+  return 0;
+}

tests/multi-file/cross_tu_anon_enum_collision/b.c

@@ -0,0 +1,9 @@
+// anon enum below shares the same declaration line as b.c:enum { ALPHA = 7 }
+
+enum { BETA = 9 };
+
+int b_value(void) {
+  int x = 0;
+  x |= BETA;
+  return x;
+}