commit d638cf54eb84f98d96510d81e0f579bfe0405801
author Rosica Dejanovska <rosica@google.com> Wed Mar 23 15:45:01 2022 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 22:27:47 2022 +0000
tree 4a5287203a3d4708f901238c2662db936865b7c8
parent 06f76b1dbdb26bb0d8067c54f92bda0538c6ce83

Rename DeclId to ItemId and make all our items have an item id.

Namespaces will contain an List<ItemId> that we'll use to generate the right items to the right place. For this, Comments and UnsupportedItems also need an id. For comments we use the address of the RawComment as an id, and the UnsupportedItem gets the id of its own decl (as of https://github.com/google/crubit/commit/593559136eb262fe3870c9827a00f232439a7587 we are generating one pre-IR item per decl, so each UnsupportedItem gets a unique id)

PiperOrigin-RevId: 436748182

rs_bindings_from_cc/importer.cc

diff --git a/rs_bindings_from_cc/importer.cc b/rs_bindings_from_cc/importer.cc
index 0de6f11..4f35b30 100644
--- a/rs_bindings_from_cc/importer.cc
+++ b/rs_bindings_from_cc/importer.cc
@@ -103,8 +103,12 @@
   return it->second;
 }
 
-DeclId GenerateDeclId(const clang::Decl* decl) {
-  return DeclId(reinterpret_cast<uintptr_t>(decl->getCanonicalDecl()));
+ItemId GenerateItemId(const clang::Decl* decl) {
+  return ItemId(reinterpret_cast<uintptr_t>(decl->getCanonicalDecl()));
+}
+
+ItemId GenerateItemId(const clang::RawComment* comment) {
+  return ItemId(reinterpret_cast<uintptr_t>(comment));
 }
 
 std::vector<BaseClass> GetUnambiguousPublicBases(
@@ -172,7 +176,7 @@
       CRUBIT_CHECK((!offset.hasValue() || *offset >= 0) &&
                    "Concrete base classes should have non-negative offsets.");
       bases.push_back(
-          BaseClass{.base_record_id = GenerateDeclId(base_record_decl),
+          BaseClass{.base_record_id = GenerateItemId(base_record_decl),
                     .offset = offset});
       break;
     }
@@ -398,7 +402,8 @@
   for (auto comment : ImportFreeComments()) {
     items.push_back(std::make_tuple(
         comment->getSourceRange(), 0 /* decl_order */,
-        Comment{.text = comment->getFormattedText(sm, sm.getDiagnostics())}));
+        Comment{.text = comment->getFormattedText(sm, sm.getDiagnostics()),
+                .id = GenerateItemId(comment)}));
   }
   std::sort(items.begin(), items.end(), is_less_than);
 
@@ -637,7 +642,7 @@
     }
 
     member_func_metadata = MemberFuncMetadata{
-        .record_id = GenerateDeclId(method_decl->getParent()),
+        .record_id = GenerateItemId(method_decl->getParent()),
         .instance_method_metadata = instance_metadata};
   }
 
@@ -784,7 +789,7 @@
   return Record{
       .rs_name = std::string(record_name->Ident()),
       .cc_name = std::string(record_name->Ident()),
-      .id = GenerateDeclId(record_decl),
+      .id = GenerateItemId(record_decl),
       .owning_target = GetOwningTarget(record_decl),
       .doc_comment = GetComment(record_decl),
       .unambiguous_public_bases = GetUnambiguousPublicBases(*record_decl, ctx_),
@@ -848,7 +853,7 @@
 
   return Enum{
       .identifier = *enum_name,
-      .id = GenerateDeclId(enum_decl),
+      .id = GenerateItemId(enum_decl),
       .owning_target = GetOwningTarget(enum_decl),
       .underlying_type = *std::move(type),
       .enumerators = enumerators,
@@ -862,8 +867,10 @@
     name = named_decl->getQualifiedNameAsString();
   }
   SourceLoc source_loc = ConvertSourceLocation(decl->getBeginLoc());
-  return UnsupportedItem{
-      .name = name, .message = error, .source_loc = source_loc};
+  return UnsupportedItem{.name = name,
+                         .message = error,
+                         .source_loc = source_loc,
+                         .id = GenerateItemId(decl)};
 }
 
 IR::Item Importer::ImportUnsupportedItem(const clang::Decl* decl,
@@ -900,7 +907,7 @@
   if (underlying_type.ok()) {
     known_type_decls_.insert(typedef_name_decl);
     return TypeAlias{.identifier = *identifier,
-                     .id = GenerateDeclId(typedef_name_decl),
+                     .id = GenerateItemId(typedef_name_decl),
                      .owning_target = GetOwningTarget(typedef_name_decl),
                      .doc_comment = GetComment(typedef_name_decl),
                      .underlying_type = *underlying_type};
@@ -961,7 +968,7 @@
         "No generated bindings found for '$0'", decl->getNameAsString()));
   }
 
-  DeclId decl_id = GenerateDeclId(decl);
+  ItemId decl_id = GenerateItemId(decl);
   return MappedType::WithDeclId(decl_id);
 }