[ClangImporter] Use new LocalDeclID

There were a number of upstream LLVM changes to `DeclID` in order to
separate "local" and "global" IDs:
llvm/llvm-project@07b1177
llvm/llvm-project@b8e3b2a
llvm/llvm-project@b467c6b
llvm/llvm-project#89873
llvm/llvm-project@d86cc73
llvm/llvm-project@8af8602
... and probably more.

This likely needs further cleaning up to not use `DeclID` at all.

Author: bnbarham

lib/ClangImporter/SwiftLookupTable.cpp

@@ -833,12 +833,12 @@ ArrayRef<clang::ObjCCategoryDecl *> SwiftLookupTable::categories() {
 
   // Map categories known to the reader.
   for (auto declID : Reader->categories()) {
-    auto category =
-      cast_or_null<clang::ObjCCategoryDecl>(
-        Reader->getASTReader().GetLocalDecl(Reader->getModuleFile(), declID));
+    auto localID = clang::LocalDeclID::get(Reader->getASTReader(),
+                                           Reader->getModuleFile(), declID);
+    auto category = cast_or_null<clang::ObjCCategoryDecl>(
+        Reader->getASTReader().GetLocalDecl(Reader->getModuleFile(), localID));
     if (category)
       Categories.push_back(category);
-
   }
 
   return Categories;
@@ -930,8 +930,8 @@ static void printStoredContext(SwiftLookupTable::StoredContext context,
   }
 }
 
-static uint32_t getEncodedDeclID(uint64_t entry) {
-  assert(SwiftLookupTable::isSerializationIDEntry(entry)); 
+static uint64_t getEncodedDeclID(uint64_t entry) {
+  assert(SwiftLookupTable::isSerializationIDEntry(entry));
   assert(SwiftLookupTable::isDeclEntry(entry));
   return entry >> 2;
 }
@@ -1190,7 +1190,7 @@ namespace {
           uint64_t id;
           auto mappedEntry = Table.mapStored(entry, isModule);
           if (auto *decl = mappedEntry.dyn_cast<clang::NamedDecl *>()) {
-            id = (Writer.getDeclID(decl) << 2) | 0x02;
+            id = (Writer.getDeclID(decl).getRawValue() << 2) | 0x02;
           } else if (auto *macro = mappedEntry.dyn_cast<clang::MacroInfo *>()) {
             id = static_cast<uint64_t>(Writer.getMacroID(macro)) << 32;
             id |= 0x02 | 0x01;
@@ -1272,7 +1272,7 @@ namespace {
         uint64_t id;
         auto mappedEntry = Table.mapStored(entry, isModule);
         if (auto *decl = mappedEntry.dyn_cast<clang::NamedDecl *>()) {
-          id = (Writer.getDeclID(decl) << 2) | 0x02;
+          id = (Writer.getDeclID(decl).getRawValue() << 2) | 0x02;
         } else if (auto *macro = mappedEntry.dyn_cast<clang::MacroInfo *>()) {
           id = static_cast<uint64_t>(Writer.getMacroID(macro)) << 32;
           id |= 0x02 | 0x01;
@@ -1332,7 +1332,7 @@ void SwiftLookupTableWriter::writeExtensionContents(
   if (!table.Categories.empty()) {
     SmallVector<clang::serialization::DeclID, 4> categoryIDs;
     for (auto category : table.Categories) {
-      categoryIDs.push_back(Writer.getDeclID(category));
+      categoryIDs.push_back(Writer.getDeclID(category).getRawValue());
     }
 
     StringRef blob(reinterpret_cast<const char *>(categoryIDs.data()),
@@ -1555,10 +1555,11 @@ clang::NamedDecl *SwiftLookupTable::mapStoredDecl(uint64_t &entry) {
 
   // Otherwise, resolve the declaration.
   assert(Reader && "Cannot resolve the declaration without a reader");
-  uint32_t declID = getEncodedDeclID(entry);
+  auto declID = getEncodedDeclID(entry);
+  auto localID = clang::LocalDeclID::get(Reader->getASTReader(),
+                                         Reader->getModuleFile(), declID);
   auto decl = cast_or_null<clang::NamedDecl>(
-                Reader->getASTReader().GetLocalDecl(Reader->getModuleFile(),
-                                                    declID));
+      Reader->getASTReader().GetLocalDecl(Reader->getModuleFile(), localID));
 
   // Update the entry now that we've resolved the declaration.
   entry = encodeEntry(decl);