[APINotes] NFC: refactor, reduce code duplication

rdar://113403829

Author: egorzhdan

clang/lib/APINotes/APINotesFormat.h

@@ -249,6 +249,17 @@ struct StoredObjCSelector {
   unsigned NumPieces;
   llvm::SmallVector<IdentifierID, 2> Identifiers;
 };
+
+inline std::tuple<uint32_t, uint8_t, uint32_t>
+getTableKey(std::optional<Context> context, IdentifierID nameID) {
+  std::tuple<uint32_t, uint8_t, uint32_t> key;
+  if (context)
+    key = {context->id.Value, (uint8_t)context->kind, nameID};
+  else
+    key = {(uint32_t)-1, (uint8_t)-1, nameID};
+  return key;
+}
+
 } // namespace api_notes
 } // namespace clang
 

clang/lib/APINotes/APINotesReader.cpp

@@ -1949,11 +1949,7 @@ auto APINotesReader::lookupGlobalVariable(std::optional<Context> context,
   if (!nameID)
     return None;
 
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, *nameID};
-  else
-    key = {-1, (uint8_t)-1, *nameID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, *nameID);
 
   auto known = Impl.GlobalVariableTable->find(key);
   if (known == Impl.GlobalVariableTable->end())
@@ -1972,11 +1968,7 @@ auto APINotesReader::lookupGlobalFunction(std::optional<Context> context,
   if (!nameID)
     return None;
 
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, *nameID};
-  else
-    key = {-1, (uint8_t)-1, *nameID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, *nameID);
 
   auto known = Impl.GlobalFunctionTable->find(key);
   if (known == Impl.GlobalFunctionTable->end())
@@ -2010,11 +2002,7 @@ auto APINotesReader::lookupTag(std::optional<Context> context, StringRef name)
   if (!nameID)
     return None;
 
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, *nameID};
-  else
-    key = {-1, (uint8_t)-1, *nameID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, *nameID);
 
   auto known = Impl.TagTable->find(key);
   if (known == Impl.TagTable->end())
@@ -2033,11 +2021,7 @@ auto APINotesReader::lookupTypedef(std::optional<Context> context,
   if (!nameID)
     return None;
 
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, *nameID};
-  else
-    key = {-1, (uint8_t)-1, *nameID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, *nameID);
 
   auto known = Impl.TypedefTable->find(key);
   if (known == Impl.TypedefTable->end())

clang/lib/APINotes/APINotesWriter.cpp

@@ -1328,11 +1328,8 @@ void APINotesWriter::addGlobalVariable(std::optional<Context> context,
                                        const GlobalVariableInfo &info,
                                        VersionTuple swiftVersion) {
   IdentifierID variableID = Impl.getIdentifier(name);
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, variableID};
-  else
-    key = {-1, (uint8_t)-1, variableID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key =
+      getTableKey(context, variableID);
   Impl.GlobalVariables[key].push_back({swiftVersion, info});
 }
 
@@ -1341,11 +1338,7 @@ void APINotesWriter::addGlobalFunction(std::optional<Context> context,
                                        const GlobalFunctionInfo &info,
                                        VersionTuple swiftVersion) {
   IdentifierID nameID = Impl.getIdentifier(name);
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, nameID};
-  else
-    key = {-1, (uint8_t)-1, nameID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, nameID);
   Impl.GlobalFunctions[key].push_back({swiftVersion, info});
 }
 
@@ -1360,23 +1353,15 @@ void APINotesWriter::addTag(std::optional<Context> context,
                             llvm::StringRef name, const TagInfo &info,
                             VersionTuple swiftVersion) {
   IdentifierID tagID = Impl.getIdentifier(name);
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, tagID};
-  else
-    key = {-1, (uint8_t)-1, tagID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, tagID);
   Impl.Tags[key].push_back({swiftVersion, info});
 }
 
 void APINotesWriter::addTypedef(std::optional<Context> context,
                                 llvm::StringRef name, const TypedefInfo &info,
                                 VersionTuple swiftVersion) {
   IdentifierID typedefID = Impl.getIdentifier(name);
-  std::tuple<uint32_t, uint8_t, uint32_t> key;
-  if (context)
-    key = {context->id.Value, (uint8_t)context->kind, typedefID};
-  else
-    key = {-1, (uint8_t)-1, typedefID};
+  std::tuple<uint32_t, uint8_t, uint32_t> key = getTableKey(context, typedefID);
   Impl.Typedefs[key].push_back({swiftVersion, info});
 }