[clang][ssaf] Add asTuple helper to EntityName and BuildNamespace

Author: jkorous-apple

clang/include/clang/Analysis/Scalable/Model/BuildNamespace.h

@@ -30,6 +30,9 @@ std::optional<BuildNamespaceKind> parseBuildNamespaceKind(llvm::StringRef Str);
 class BuildNamespace {
   BuildNamespaceKind Kind;
   std::string Name;
+
+  auto asTuple() const { return std::tie(Kind, Name); }
+
 public:
   BuildNamespace(BuildNamespaceKind Kind, llvm::StringRef Name)
     : Kind(Kind), Name(Name.str()) {}

clang/include/clang/Analysis/Scalable/Model/EntityName.h

@@ -26,6 +26,8 @@ class EntityName {
   llvm::SmallString<16> Suffix;
   NestedBuildNamespace Namespace;
 
+  auto asTuple() const { return std::tie(USR, Suffix, Namespace); }
+
 public:
   EntityName(llvm::StringRef USR, llvm::StringRef Suffix,
              NestedBuildNamespace Namespace);

clang/lib/Analysis/Scalable/Model/BuildNamespace.cpp

@@ -8,6 +8,7 @@
 
 #include "clang/Analysis/Scalable/Model/BuildNamespace.h"
 #include "llvm/Support/ErrorHandling.h"
+#include <tuple>
 
 namespace clang::ssaf {
 
@@ -32,17 +33,15 @@ BuildNamespace BuildNamespace::makeTU(llvm::StringRef CompilationId) {
 }
 
 bool BuildNamespace::operator==(const BuildNamespace& Other) const {
-  return Kind == Other.Kind && Name == Other.Name;
+  return asTuple() == Other.asTuple();
 }
 
 bool BuildNamespace::operator!=(const BuildNamespace& Other) const {
   return !(*this == Other);
 }
 
 bool BuildNamespace::operator<(const BuildNamespace& Other) const {
-  if (Kind != Other.Kind)
-    return Kind < Other.Kind;
-  return Name < Other.Name;
+  return asTuple() < Other.asTuple();
 }
 
 NestedBuildNamespace NestedBuildNamespace::makeTU(llvm::StringRef CompilationId) {

clang/lib/Analysis/Scalable/Model/EntityName.cpp

@@ -15,21 +15,15 @@ EntityName::EntityName(llvm::StringRef USR, llvm::StringRef Suffix,
   : USR(USR.str()), Suffix(Suffix), Namespace(std::move(Namespace)) {}
 
 bool EntityName::operator==(const EntityName& Other) const {
-  return USR == Other.USR &&
-         Suffix == Other.Suffix &&
-         Namespace == Other.Namespace;
+  return asTuple() == Other.asTuple();
 }
 
 bool EntityName::operator!=(const EntityName& Other) const {
   return !(*this == Other);
 }
 
-bool EntityName::operator<(const EntityName& Other) const {
-  if (USR != Other.USR)
-    return USR < Other.USR;
-  if (Suffix != Other.Suffix)
-    return Suffix.str() < Other.Suffix.str();
-  return Namespace < Other.Namespace;
+bool EntityName::operator<(const EntityName &Other) const {
+  return asTuple() < Other.asTuple();
 }
 
 EntityName EntityName::makeQualified(NestedBuildNamespace Namespace) const {