[clang] [clang][ssaf] Add entity metadata for linking (PR #214369)

Aviral Goel via cfe-commits cfe-commits at lists.llvm.org
Wed Aug 5 16:47:37 PDT 2026


https://github.com/aviralg created https://github.com/llvm/llvm-project/pull/214369

None

>From 7d1a22e0659cd65c428347ab4cbb68e18542922b Mon Sep 17 00:00:00 2001
From: Aviral Goel <goel.aviral at gmail.com>
Date: Wed, 5 Aug 2026 16:43:15 -0700
Subject: [PATCH] Add linkage fields

---
 .../Core/Model/EntityLinkage.h                |  50 ++++++-
 .../Core/Model/PrivateFieldNames.def          |   4 +
 .../Core/TUSummary/TUSummaryBuilder.h         |   2 +-
 .../Core/Model/EntityLinkage.cpp              |  28 +++-
 .../Core/ModelStringConversions.h             | 124 ++++++++++++++++
 .../JSONFormat/JSONFormatImpl.cpp             | 140 ++++++++++++++++--
 .../Serialization/JSONFormat/JSONFormatImpl.h |  29 ++++
 .../Core/TUSummary/TUSummaryBuilder.cpp       |  14 +-
 .../Core/TUSummary/TUSummaryExtractor.cpp     | 132 +++++++++++++----
 .../Inputs/tu-summary-bad-array.json          |  18 ++-
 .../Inputs/tu-summary-bad-summary.json        |  18 ++-
 .../PointerFlow/Inputs/tu-summary-no-key.json |  18 ++-
 .../PointerFlow/Inputs/tu-summary.json        |  18 ++-
 .../Inputs/tu-summary-bad-id.json             |   6 +-
 .../Inputs/tu-summary-no-key.json             |   6 +-
 .../Inputs/tu-summary.json                    |  18 ++-
 .../Inputs/tu-summary-bad-element.json        |  12 +-
 .../Inputs/tu-summary-bad-ptr-level.json      |  12 +-
 .../Inputs/tu-summary-no-key.json             |  12 +-
 .../UnsafeBufferUsage/Inputs/tu-summary.json  |  18 ++-
 .../ssaf-analyzer/Inputs/lu-tags-only.json    |   6 +-
 .../Scalable/ssaf-analyzer/Inputs/lu.json     |  18 ++-
 ...rt-multi-arch-shared-library-nonempty.json |  12 +-
 .../invalid-direct-callee-element.json        |   6 +-
 .../CallGraph/invalid-direct-callee-id.json   |   6 +-
 .../Inputs/CallGraph/missing-def-col.json     |   6 +-
 .../Inputs/CallGraph/missing-def-file.json    |   6 +-
 .../Inputs/CallGraph/missing-def-line.json    |   6 +-
 .../Inputs/CallGraph/missing-def.json         |   6 +-
 .../CallGraph/missing-direct-callees.json     |   6 +-
 .../Inputs/CallGraph/missing-pretty-name.json |   6 +-
 .../CallGraph/missing-virtual-callees.json    |   6 +-
 .../duplicate-entity-id-in-data-map.json      |   6 +-
 .../LUSummary/Inputs/duplicate-entity.json    |  12 +-
 .../Inputs/entity-name-missing-namespace.json |   6 +-
 .../Inputs/entity-name-missing-suffix.json    |   6 +-
 .../Inputs/entity-name-missing-usr.json       |   6 +-
 .../Inputs/linkage-table-duplicate-id.json    |  12 +-
 .../linkage-table-entry-id-not-uint64.json    |   6 +-
 ...kage-table-entry-linkage-invalid-type.json |   6 +-
 .../linkage-table-entry-missing-id.json       |   6 +-
 .../Inputs/linkage-table-extra-id.json        |   6 +-
 .../namespace-element-invalid-kind.json       |   6 +-
 .../namespace-element-missing-kind.json       |   6 +-
 .../namespace-element-missing-name.json       |   6 +-
 .../Inputs/namespace-element-not-object.json  |   6 +-
 .../LUSummary/Inputs/rt-linkage-external.json |   6 +-
 .../LUSummary/Inputs/rt-linkage-internal.json |   6 +-
 .../LUSummary/Inputs/rt-linkage-multiple.json |  18 ++-
 .../LUSummary/Inputs/rt-linkage-none.json     |   6 +-
 .../Inputs/rt-two-summary-types.json          |  30 +++-
 .../Inputs/rt-nonempty-members.json           |  12 +-
 .../duplicate-entity-id-in-data-map.json      |   6 +-
 .../TUSummary/Inputs/duplicate-entity.json    |   4 +-
 .../Inputs/entity-name-missing-suffix.json    |   2 +-
 .../Inputs/entity-name-missing-usr.json       |   2 +-
 .../Inputs/id-table-entry-missing-name.json   |   2 +-
 .../Inputs/linkage-table-duplicate-id.json    |   4 +-
 .../linkage-table-entry-id-not-uint64.json    |   2 +-
 .../linkage-table-entry-missing-id.json       |   2 +-
 .../Inputs/linkage-table-extra-id.json        |   2 +-
 .../TUSummary/Inputs/rt-linkage-external.json |   6 +-
 .../TUSummary/Inputs/rt-linkage-internal.json |   6 +-
 .../TUSummary/Inputs/rt-linkage-multiple.json |  18 ++-
 .../TUSummary/Inputs/rt-linkage-none.json     |   6 +-
 .../Inputs/rt-two-summary-types.json          |  30 +++-
 .../Scalable/ssaf-linker/Inputs/tu-1.json     |  36 ++++-
 .../Scalable/ssaf-linker/Inputs/tu-2.json     |  36 ++++-
 .../Inputs/tu-invalid-entity-id-multikey.json |   6 +-
 .../Inputs/tu-invalid-entity-id-ref.json      |   6 +-
 .../Inputs/tu-invalid-entity-id-value.json    |   6 +-
 .../Scalable/ssaf-linker/Outputs/libtwo.json  |  72 +++++++--
 .../Scalable/ssaf-linker/Outputs/lu-1+2.json  |  66 +++++++--
 .../Scalable/ssaf-linker/Outputs/lu-1.json    |  36 ++++-
 .../Scalable/ssaf-linker/Outputs/lu-2.json    |  36 ++++-
 .../PointerFlow/PointerFlowWPATest.cpp        |   7 +-
 .../UnsafeBufferUsageWPATest.cpp              |   7 +-
 .../EntityLinkageTest.cpp                     |  97 +++++++-----
 .../EntityLinkerTest.cpp                      |  13 +-
 .../SharedLexicalRepresentationFormatTest.cpp |   7 +-
 .../SummaryData/SummaryDataTest.cpp           |   7 +-
 .../AnalysisDriverTest.cpp                    |   7 +-
 .../UnsafeBufferReachableAnalysisTest.cpp     |   7 +-
 83 files changed, 1240 insertions(+), 247 deletions(-)

diff --git a/clang/include/clang/ScalableStaticAnalysis/Core/Model/EntityLinkage.h b/clang/include/clang/ScalableStaticAnalysis/Core/Model/EntityLinkage.h
index f90571c672452..e1fd19e77d877 100644
--- a/clang/include/clang/ScalableStaticAnalysis/Core/Model/EntityLinkage.h
+++ b/clang/include/clang/ScalableStaticAnalysis/Core/Model/EntityLinkage.h
@@ -11,6 +11,7 @@
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
+#include <cstdint>
 
 namespace clang::ssaf {
 
@@ -21,17 +22,46 @@ enum class EntityLinkageType {
             ///< of functions with external linkage)
 };
 
-/// Represents the linkage properties of an entity in the program model.
+/// Symbol strength: who wins when two external definitions collide.
+enum class EntityBinding : uint8_t {
+  Strong,   ///< ordinary definition; at most one permitted
+  Weak,     ///< __attribute__((weak)); overridden by a strong definition
+  WeakODR,  ///< inline/template/vtable; identical definitions are coalesced
+  Common,   ///< C tentative definition; merged, size = max
+  Undefined ///< a reference with no definition in this unit
+};
+
+/// How far a symbol escapes its link unit.
+enum class EntityVisibility : uint8_t {
+  Default,  ///< participates in cross-LU resolution; exported/interposable
+  Hidden,   ///< visible within the LU, not exported past its boundary
+  Protected ///< exported but bound to the defining LU (not interposable)
+};
+
+/// Whether this occurrence defines the entity or merely declares/references it.
+enum class EntityDefinitionKind : uint8_t { Definition, Declaration };
+
+/// Whether the entity must be kept even if unreferenced (used / no_dead_strip).
+enum class EntityRetention : uint8_t { NotRetained, Retained };
+
+/// Represents the linker-relevant properties of an entity in the program model.
 ///
-/// EntityLinkage captures whether an entity has no linkage, internal linkage,
-/// or external linkage, which determines its visibility and accessibility
-/// across translation units.
+/// EntityLinkage captures the scope, strength, visibility, definition state,
+/// and retention of an entity, which together determine how it is resolved and
+/// exported across translation units and link units.
 class EntityLinkage {
   friend class SerializationFormat;
   friend class TestFixture;
+  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                       const EntityLinkage &Linkage);
 
 public:
-  constexpr explicit EntityLinkage(EntityLinkageType L) : Linkage(L) {}
+  constexpr EntityLinkage(EntityLinkageType Linkage, EntityBinding Binding,
+                          EntityVisibility Visibility,
+                          EntityDefinitionKind DefinitionKind,
+                          EntityRetention Retention)
+      : Linkage(Linkage), Binding(Binding), Visibility(Visibility),
+        DefinitionKind(DefinitionKind), Retention(Retention) {}
 
   EntityLinkageType getLinkage() const { return Linkage; }
 
@@ -40,10 +70,20 @@ class EntityLinkage {
 
 private:
   EntityLinkageType Linkage;
+  EntityBinding Binding;
+  EntityVisibility Visibility;
+  EntityDefinitionKind DefinitionKind;
+  EntityRetention Retention;
 };
 
 /// Writes a string representation of the linkage type to the stream.
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, EntityLinkageType Linkage);
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, EntityBinding Binding);
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                              EntityVisibility Visibility);
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                              EntityDefinitionKind DefinitionKind);
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, EntityRetention Retention);
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
                               const EntityLinkage &Linkage);
diff --git a/clang/include/clang/ScalableStaticAnalysis/Core/Model/PrivateFieldNames.def b/clang/include/clang/ScalableStaticAnalysis/Core/Model/PrivateFieldNames.def
index 33f47f8f9151c..073f81ea7ee00 100644
--- a/clang/include/clang/ScalableStaticAnalysis/Core/Model/PrivateFieldNames.def
+++ b/clang/include/clang/ScalableStaticAnalysis/Core/Model/PrivateFieldNames.def
@@ -22,6 +22,10 @@ FIELD(BuildNamespace, Name)
 FIELD(EntityId, Index)
 FIELD(EntityIdTable, Entities)
 FIELD(EntityLinkage, Linkage)
+FIELD(EntityLinkage, Binding)
+FIELD(EntityLinkage, Visibility)
+FIELD(EntityLinkage, DefinitionKind)
+FIELD(EntityLinkage, Retention)
 FIELD(EntityName, Namespace)
 FIELD(EntityName, Suffix)
 FIELD(EntityName, USR)
diff --git a/clang/include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.h b/clang/include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.h
index 5132761ed6bb5..3f78754978056 100644
--- a/clang/include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.h
+++ b/clang/include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.h
@@ -26,7 +26,7 @@ class TUSummaryBuilder {
   TUSummaryBuilder(TUSummary &Summary, const SSAFOptions &Options)
       : Summary(Summary), Options(Options) {}
 
-  EntityId addEntity(const EntityName &EN, EntityLinkageType Linkage);
+  EntityId addEntity(const EntityName &EN, EntityLinkage Linkage);
 
   /// Associate the \p Data \c EntitySummary with the \p Entity.
   /// This consumes the \p Data only if \p Entity wasn't associated yet with the
diff --git a/clang/lib/ScalableStaticAnalysis/Core/Model/EntityLinkage.cpp b/clang/lib/ScalableStaticAnalysis/Core/Model/EntityLinkage.cpp
index 0bae90cd66a22..dfa6668b847bb 100644
--- a/clang/lib/ScalableStaticAnalysis/Core/Model/EntityLinkage.cpp
+++ b/clang/lib/ScalableStaticAnalysis/Core/Model/EntityLinkage.cpp
@@ -13,7 +13,9 @@
 namespace clang::ssaf {
 
 bool EntityLinkage::operator==(const EntityLinkage &Other) const {
-  return Linkage == Other.Linkage;
+  return Linkage == Other.Linkage && Binding == Other.Binding &&
+         Visibility == Other.Visibility &&
+         DefinitionKind == Other.DefinitionKind && Retention == Other.Retention;
 }
 
 bool EntityLinkage::operator!=(const EntityLinkage &Other) const {
@@ -25,9 +27,29 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
   return OS << entityLinkageTypeToString(Linkage);
 }
 
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, EntityBinding Binding) {
+  return OS << entityBindingToString(Binding);
+}
+
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                              EntityVisibility Visibility) {
+  return OS << entityVisibilityToString(Visibility);
+}
+
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                              const EntityLinkage &Linkage) {
-  return OS << "EntityLinkage(" << Linkage.getLinkage() << ")";
+                              EntityDefinitionKind DefinitionKind) {
+  return OS << entityDefinitionKindToString(DefinitionKind);
+}
+
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                              EntityRetention Retention) {
+  return OS << entityRetentionToString(Retention);
+}
+
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const EntityLinkage &EL) {
+  return OS << "EntityLinkage(" << EL.Linkage << ", " << EL.Binding << ", "
+            << EL.Visibility << ", " << EL.DefinitionKind << ", "
+            << EL.Retention << ")";
 }
 
 } // namespace clang::ssaf
diff --git a/clang/lib/ScalableStaticAnalysis/Core/ModelStringConversions.h b/clang/lib/ScalableStaticAnalysis/Core/ModelStringConversions.h
index 9a4392bd72990..0ac4689b7295d 100644
--- a/clang/lib/ScalableStaticAnalysis/Core/ModelStringConversions.h
+++ b/clang/lib/ScalableStaticAnalysis/Core/ModelStringConversions.h
@@ -90,6 +90,130 @@ entityLinkageTypeFromString(llvm::StringRef Str) {
   return std::nullopt;
 }
 
+//===----------------------------------------------------------------------===//
+// EntityBinding
+//===----------------------------------------------------------------------===//
+
+/// Returns the canonical string representation of \p B (e.g. "Strong",
+/// "WeakODR").
+inline llvm::StringRef entityBindingToString(EntityBinding B) {
+  switch (B) {
+  case EntityBinding::Strong:
+    return "Strong";
+  case EntityBinding::Weak:
+    return "Weak";
+  case EntityBinding::WeakODR:
+    return "WeakODR";
+  case EntityBinding::Common:
+    return "Common";
+  case EntityBinding::Undefined:
+    return "Undefined";
+  }
+  llvm_unreachable("Unhandled EntityBinding variant");
+}
+
+/// Parses a string produced by entityBindingToString(). Returns std::nullopt
+/// if \p Str does not match any known EntityBinding value.
+inline std::optional<EntityBinding>
+entityBindingFromString(llvm::StringRef Str) {
+  if (Str == "Strong")
+    return EntityBinding::Strong;
+  if (Str == "Weak")
+    return EntityBinding::Weak;
+  if (Str == "WeakODR")
+    return EntityBinding::WeakODR;
+  if (Str == "Common")
+    return EntityBinding::Common;
+  if (Str == "Undefined")
+    return EntityBinding::Undefined;
+  return std::nullopt;
+}
+
+//===----------------------------------------------------------------------===//
+// EntityVisibility
+//===----------------------------------------------------------------------===//
+
+/// Returns the canonical string representation of \p V (e.g. "Default",
+/// "Hidden", "Protected").
+inline llvm::StringRef entityVisibilityToString(EntityVisibility V) {
+  switch (V) {
+  case EntityVisibility::Default:
+    return "Default";
+  case EntityVisibility::Hidden:
+    return "Hidden";
+  case EntityVisibility::Protected:
+    return "Protected";
+  }
+  llvm_unreachable("Unhandled EntityVisibility variant");
+}
+
+/// Parses a string produced by entityVisibilityToString(). Returns std::nullopt
+/// if \p Str does not match any known EntityVisibility value.
+inline std::optional<EntityVisibility>
+entityVisibilityFromString(llvm::StringRef Str) {
+  if (Str == "Default")
+    return EntityVisibility::Default;
+  if (Str == "Hidden")
+    return EntityVisibility::Hidden;
+  if (Str == "Protected")
+    return EntityVisibility::Protected;
+  return std::nullopt;
+}
+
+//===----------------------------------------------------------------------===//
+// EntityDefinitionKind
+//===----------------------------------------------------------------------===//
+
+/// Returns the canonical string representation of \p DK (e.g. "Definition",
+/// "Declaration").
+inline llvm::StringRef entityDefinitionKindToString(EntityDefinitionKind DK) {
+  switch (DK) {
+  case EntityDefinitionKind::Definition:
+    return "Definition";
+  case EntityDefinitionKind::Declaration:
+    return "Declaration";
+  }
+  llvm_unreachable("Unhandled EntityDefinitionKind variant");
+}
+
+/// Parses a string produced by entityDefinitionKindToString(). Returns
+/// std::nullopt if \p Str does not match any known EntityDefinitionKind value.
+inline std::optional<EntityDefinitionKind>
+entityDefinitionKindFromString(llvm::StringRef Str) {
+  if (Str == "Definition")
+    return EntityDefinitionKind::Definition;
+  if (Str == "Declaration")
+    return EntityDefinitionKind::Declaration;
+  return std::nullopt;
+}
+
+//===----------------------------------------------------------------------===//
+// EntityRetention
+//===----------------------------------------------------------------------===//
+
+/// Returns the canonical string representation of \p R (e.g. "Retained",
+/// "NotRetained").
+inline llvm::StringRef entityRetentionToString(EntityRetention R) {
+  switch (R) {
+  case EntityRetention::NotRetained:
+    return "NotRetained";
+  case EntityRetention::Retained:
+    return "Retained";
+  }
+  llvm_unreachable("Unhandled EntityRetention variant");
+}
+
+/// Parses a string produced by entityRetentionToString(). Returns std::nullopt
+/// if \p Str does not match any known EntityRetention value.
+inline std::optional<EntityRetention>
+entityRetentionFromString(llvm::StringRef Str) {
+  if (Str == "NotRetained")
+    return EntityRetention::NotRetained;
+  if (Str == "Retained")
+    return EntityRetention::Retained;
+  return std::nullopt;
+}
+
 } // namespace clang::ssaf
 
 #endif // LLVM_CLANG_LIB_ScalableStaticAnalysis_CORE_MODELSTRINGCONVERSIONS_H
diff --git a/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.cpp b/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.cpp
index b19849233f0f8..4ae4b13625cdf 100644
--- a/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.cpp
+++ b/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.cpp
@@ -443,6 +443,67 @@ llvm::StringRef entityLinkageTypeToJSON(EntityLinkageType LT) {
   return entityLinkageTypeToString(LT);
 }
 
+//----------------------------------------------------------------------------
+// EntityBinding / EntityVisibility / EntityDefinitionKind / EntityRetention
+//----------------------------------------------------------------------------
+
+llvm::Expected<EntityBinding> entityBindingFromJSON(llvm::StringRef Str) {
+  auto Opt = entityBindingFromString(Str);
+  if (!Opt) {
+    return ErrorBuilder::create(std::errc::invalid_argument,
+                                ErrorMessages::InvalidEntityBinding, Str)
+        .build();
+  }
+  return *Opt;
+}
+
+llvm::StringRef entityBindingToJSON(EntityBinding B) {
+  return entityBindingToString(B);
+}
+
+llvm::Expected<EntityVisibility> entityVisibilityFromJSON(llvm::StringRef Str) {
+  auto Opt = entityVisibilityFromString(Str);
+  if (!Opt) {
+    return ErrorBuilder::create(std::errc::invalid_argument,
+                                ErrorMessages::InvalidEntityVisibility, Str)
+        .build();
+  }
+  return *Opt;
+}
+
+llvm::StringRef entityVisibilityToJSON(EntityVisibility V) {
+  return entityVisibilityToString(V);
+}
+
+llvm::Expected<EntityDefinitionKind>
+entityDefinitionKindFromJSON(llvm::StringRef Str) {
+  auto Opt = entityDefinitionKindFromString(Str);
+  if (!Opt) {
+    return ErrorBuilder::create(std::errc::invalid_argument,
+                                ErrorMessages::InvalidEntityDefinitionKind, Str)
+        .build();
+  }
+  return *Opt;
+}
+
+llvm::StringRef entityDefinitionKindToJSON(EntityDefinitionKind DK) {
+  return entityDefinitionKindToString(DK);
+}
+
+llvm::Expected<EntityRetention> entityRetentionFromJSON(llvm::StringRef Str) {
+  auto Opt = entityRetentionFromString(Str);
+  if (!Opt) {
+    return ErrorBuilder::create(std::errc::invalid_argument,
+                                ErrorMessages::InvalidEntityRetention, Str)
+        .build();
+  }
+  return *Opt;
+}
+
+llvm::StringRef entityRetentionToJSON(EntityRetention R) {
+  return entityRetentionToString(R);
+}
+
 //----------------------------------------------------------------------------
 // TargetTriple
 //----------------------------------------------------------------------------
@@ -464,27 +525,88 @@ llvm::Error validateNormalizedTargetTriple(llvm::StringRef Triple) {
 
 llvm::Expected<EntityLinkage>
 JSONFormat::entityLinkageFromJSON(const Object &EntityLinkageObject) const {
-  auto OptLinkageStr = EntityLinkageObject.getString("type");
-  if (!OptLinkageStr) {
-    return ErrorBuilder::create(std::errc::invalid_argument,
-                                ErrorMessages::FailedToReadObjectAtField,
-                                "EntityLinkageType", "type", "string")
-        .build();
-  }
+  auto ReadStr = [&](llvm::StringRef ObjLabel,
+                     llvm::StringRef Field) -> llvm::Expected<llvm::StringRef> {
+    auto OptStr = EntityLinkageObject.getString(Field);
+    if (!OptStr) {
+      return ErrorBuilder::create(std::errc::invalid_argument,
+                                  ErrorMessages::FailedToReadObjectAtField,
+                                  ObjLabel, Field, "string")
+          .build();
+    }
+    return *OptStr;
+  };
 
-  auto ExpectedLinkageType = entityLinkageTypeFromJSON(*OptLinkageStr);
+  auto TypeStr = ReadStr("EntityLinkageType", "type");
+  if (!TypeStr) {
+    return TypeStr.takeError();
+  }
+  auto ExpectedLinkageType = entityLinkageTypeFromJSON(*TypeStr);
   if (!ExpectedLinkageType) {
     return ErrorBuilder::wrap(ExpectedLinkageType.takeError())
         .context(ErrorMessages::ReadingFromField, "EntityLinkageType", "type")
         .build();
   }
 
-  return EntityLinkage(*ExpectedLinkageType);
+  auto BindingStr = ReadStr("EntityBinding", "binding");
+  if (!BindingStr) {
+    return BindingStr.takeError();
+  }
+  auto ExpectedBinding = entityBindingFromJSON(*BindingStr);
+  if (!ExpectedBinding) {
+    return ErrorBuilder::wrap(ExpectedBinding.takeError())
+        .context(ErrorMessages::ReadingFromField, "EntityBinding", "binding")
+        .build();
+  }
+
+  auto VisibilityStr = ReadStr("EntityVisibility", "visibility");
+  if (!VisibilityStr) {
+    return VisibilityStr.takeError();
+  }
+  auto ExpectedVisibility = entityVisibilityFromJSON(*VisibilityStr);
+  if (!ExpectedVisibility) {
+    return ErrorBuilder::wrap(ExpectedVisibility.takeError())
+        .context(ErrorMessages::ReadingFromField, "EntityVisibility",
+                 "visibility")
+        .build();
+  }
+
+  auto DefinitionStr = ReadStr("EntityDefinitionKind", "definition");
+  if (!DefinitionStr) {
+    return DefinitionStr.takeError();
+  }
+  auto ExpectedDefinitionKind = entityDefinitionKindFromJSON(*DefinitionStr);
+  if (!ExpectedDefinitionKind) {
+    return ErrorBuilder::wrap(ExpectedDefinitionKind.takeError())
+        .context(ErrorMessages::ReadingFromField, "EntityDefinitionKind",
+                 "definition")
+        .build();
+  }
+
+  auto RetentionStr = ReadStr("EntityRetention", "retention");
+  if (!RetentionStr) {
+    return RetentionStr.takeError();
+  }
+  auto ExpectedRetention = entityRetentionFromJSON(*RetentionStr);
+  if (!ExpectedRetention) {
+    return ErrorBuilder::wrap(ExpectedRetention.takeError())
+        .context(ErrorMessages::ReadingFromField, "EntityRetention",
+                 "retention")
+        .build();
+  }
+
+  return EntityLinkage(*ExpectedLinkageType, *ExpectedBinding,
+                       *ExpectedVisibility, *ExpectedDefinitionKind,
+                       *ExpectedRetention);
 }
 
 Object JSONFormat::entityLinkageToJSON(const EntityLinkage &EL) const {
   Object Result;
   Result["type"] = entityLinkageTypeToJSON(getLinkage(EL));
+  Result["binding"] = entityBindingToJSON(getBinding(EL));
+  Result["visibility"] = entityVisibilityToJSON(getVisibility(EL));
+  Result["definition"] = entityDefinitionKindToJSON(getDefinitionKind(EL));
+  Result["retention"] = entityRetentionToJSON(getRetention(EL));
   return Result;
 }
 
diff --git a/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.h b/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.h
index b17f296eda1b4..d8e615662cc09 100644
--- a/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.h
+++ b/clang/lib/ScalableStaticAnalysis/Core/Serialization/JSONFormat/JSONFormatImpl.h
@@ -114,6 +114,18 @@ inline constexpr const char *InvalidBuildNamespaceKind =
 inline constexpr const char *InvalidEntityLinkageType =
     "invalid EntityLinkageType value '{0}' for field 'type'";
 
+inline constexpr const char *InvalidEntityBinding =
+    "invalid EntityBinding value '{0}' for field 'binding'";
+
+inline constexpr const char *InvalidEntityVisibility =
+    "invalid EntityVisibility value '{0}' for field 'visibility'";
+
+inline constexpr const char *InvalidEntityDefinitionKind =
+    "invalid EntityDefinitionKind value '{0}' for field 'definition'";
+
+inline constexpr const char *InvalidEntityRetention =
+    "invalid EntityRetention value '{0}' for field 'retention'";
+
 inline constexpr const char *FailedToDeserializeLinkageTableExtraId =
     "failed to deserialize LinkageTable: extra '{0}' not present in IdTable";
 
@@ -220,6 +232,23 @@ entityLinkageTypeFromJSON(llvm::StringRef EntityLinkageTypeStr);
 // Provided for consistency with respect to rest of the codebase.
 llvm::StringRef entityLinkageTypeToJSON(EntityLinkageType LT);
 
+//----------------------------------------------------------------------------
+// EntityBinding / EntityVisibility / EntityDefinitionKind / EntityRetention
+//----------------------------------------------------------------------------
+
+llvm::Expected<EntityBinding> entityBindingFromJSON(llvm::StringRef Str);
+llvm::StringRef entityBindingToJSON(EntityBinding B);
+
+llvm::Expected<EntityVisibility> entityVisibilityFromJSON(llvm::StringRef Str);
+llvm::StringRef entityVisibilityToJSON(EntityVisibility V);
+
+llvm::Expected<EntityDefinitionKind>
+entityDefinitionKindFromJSON(llvm::StringRef Str);
+llvm::StringRef entityDefinitionKindToJSON(EntityDefinitionKind DK);
+
+llvm::Expected<EntityRetention> entityRetentionFromJSON(llvm::StringRef Str);
+llvm::StringRef entityRetentionToJSON(EntityRetention R);
+
 //----------------------------------------------------------------------------
 // TargetTriple helpers
 //----------------------------------------------------------------------------
diff --git a/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.cpp b/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.cpp
index ba2def365dddc..afb1a30df150d 100644
--- a/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.cpp
+++ b/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.cpp
@@ -18,12 +18,16 @@ using namespace clang;
 using namespace ssaf;
 
 EntityId TUSummaryBuilder::addEntity(const EntityName &EN,
-                                     EntityLinkageType Linkage) {
+                                     EntityLinkage Linkage) {
   EntityId Id = Summary.IdTable.getId(EN);
-  [[maybe_unused]] EntityLinkageType Link =
-      Summary.LinkageTable.try_emplace(Id, Linkage).first->second.getLinkage();
-  // Even if we had in the past a linkage, that must bee the same as we set now.
-  assert(Link == Linkage);
+  [[maybe_unused]] const EntityLinkage &Existing =
+      Summary.LinkageTable.try_emplace(Id, Linkage).first->second;
+  // An entity's linkage type must be stable across its redeclarations within a
+  // TU. The other symbol properties (binding, visibility, definition kind,
+  // retention) may legitimately differ between a declaration and a definition
+  // of the same entity; reconciling those is the linker's responsibility, so we
+  // keep the first occurrence here and only assert linkage-type stability.
+  assert(Existing.getLinkage() == Linkage.getLinkage());
   return Id;
 }
 
diff --git a/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryExtractor.cpp b/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryExtractor.cpp
index 40205b90a4eb6..00bef7c871c8a 100644
--- a/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryExtractor.cpp
+++ b/clang/lib/ScalableStaticAnalysis/Core/TUSummary/TUSummaryExtractor.cpp
@@ -7,6 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryExtractor.h"
+#include "clang/AST/ASTContext.h"
+#include "clang/AST/Attr.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclBase.h"
 #include "clang/ScalableStaticAnalysis/Core/ASTEntityMapping.h"
@@ -19,13 +21,108 @@
 using namespace clang;
 using namespace ssaf;
 
-static EntityLinkageType getLinkageForDecl(const Decl *D) {
-  const auto *ND = dyn_cast<NamedDecl>(D);
-  if (!ND)
+static EntityLinkageType mapLinkage(const NamedDecl *ND) {
+  switch (ND->getFormalLinkage()) {
+  case Linkage::Invalid: {
+    llvm_unreachable("Shouldn't be invalid");
+  }
+  case Linkage::None:
     return EntityLinkageType::None;
+  case Linkage::Internal:
+  case Linkage::UniqueExternal:
+  case Linkage::VisibleNone:
+    return EntityLinkageType::Internal;
+  case Linkage::Module:
+  case Linkage::External:
+    return EntityLinkageType::External;
+  }
+  llvm_unreachable("Unhandled clang::Linkage kind");
+}
+
+static EntityVisibility mapVisibility(const NamedDecl *ND) {
+  switch (ND->getVisibility()) {
+  case HiddenVisibility:
+    return EntityVisibility::Hidden;
+  case ProtectedVisibility:
+    return EntityVisibility::Protected;
+  case DefaultVisibility:
+    return EntityVisibility::Default;
+  }
+  llvm_unreachable("Unhandled clang::Visibility kind");
+}
+
+static EntityDefinitionKind mapDefinitionKind(const NamedDecl *ND,
+                                              ASTContext &Ctx) {
+  if (const auto *FD = dyn_cast<FunctionDecl>(ND)) {
+    return FD->isThisDeclarationADefinition()
+               ? EntityDefinitionKind::Definition
+               : EntityDefinitionKind::Declaration;
+  }
+  if (const auto *VD = dyn_cast<VarDecl>(ND)) {
+    return VD->isThisDeclarationADefinition(Ctx) == VarDecl::DeclarationOnly
+               ? EntityDefinitionKind::Declaration
+               : EntityDefinitionKind::Definition;
+  }
+  return EntityDefinitionKind::Definition;
+}
+
+static EntityBinding mapBinding(const NamedDecl *ND, ASTContext &Ctx) {
+  if (ND->hasAttr<WeakAttr>() || ND->hasAttr<WeakRefAttr>()) {
+    return EntityBinding::Weak;
+  }
+  if (const auto *FD = dyn_cast<FunctionDecl>(ND)) {
+    if (!FD->isThisDeclarationADefinition()) {
+      return EntityBinding::Undefined;
+    }
+    switch (Ctx.GetGVALinkageForFunction(FD)) {
+    case GVA_AvailableExternally:
+      return EntityBinding::Undefined;
+    case GVA_DiscardableODR:
+    case GVA_StrongODR:
+      return EntityBinding::WeakODR;
+    case GVA_Internal:
+    case GVA_StrongExternal:
+      return EntityBinding::Strong;
+    }
+    return EntityBinding::Strong;
+  }
+  if (const auto *VD = dyn_cast<VarDecl>(ND)) {
+    switch (VD->isThisDeclarationADefinition(Ctx)) {
+    case VarDecl::DeclarationOnly:
+      return EntityBinding::Undefined;
+    case VarDecl::TentativeDefinition:
+      return EntityBinding::Common;
+    case VarDecl::Definition:
+      break;
+    }
+    switch (Ctx.GetGVALinkageForVariable(VD)) {
+    case GVA_DiscardableODR:
+    case GVA_StrongODR:
+      return EntityBinding::WeakODR;
+    default:
+      return EntityBinding::Strong;
+    }
+  }
+  return EntityBinding::Strong;
+}
+
+static EntityRetention mapRetention(const NamedDecl *ND) {
+  return (ND->hasAttr<UsedAttr>() || ND->hasAttr<RetainAttr>())
+             ? EntityRetention::Retained
+             : EntityRetention::NotRetained;
+}
+
+static EntityLinkage getEntityLinkageForDecl(const Decl *D) {
+  const auto *ND = dyn_cast<NamedDecl>(D);
+  if (!ND) {
+    return EntityLinkage(EntityLinkageType::None, EntityBinding::Undefined,
+                         EntityVisibility::Default,
+                         EntityDefinitionKind::Declaration,
+                         EntityRetention::NotRetained);
+  }
 
   // Parameters have no linkage in C++, but SSAF needs them to inherit
-  // the external linkage from their parent functions.
+  // the linker properties from their parent functions.
   // Here is why:
   //   SSAF treats parameters as entities and may not always associate them back
   //   to their parent functions. Therefore, it needs to identify parameters of
@@ -36,35 +133,20 @@ static EntityLinkageType getLinkageForDecl(const Decl *D) {
   if (const auto *PVD = dyn_cast<ParmVarDecl>(D)) {
     if (const auto *FD = llvm::dyn_cast_or_null<FunctionDecl>(
             PVD->getParentFunctionOrMethod())) {
-      return getLinkageForDecl(FD);
+      return getEntityLinkageForDecl(FD);
     }
   }
 
-  switch (ND->getFormalLinkage()) {
-  case Linkage::Invalid: {
-    llvm_unreachable("Shouldn't be invalid");
-  }
-  case Linkage::None:
-    return EntityLinkageType::None;
-  case Linkage::Internal:
-    return EntityLinkageType::Internal;
-  case Linkage::UniqueExternal:
-    return EntityLinkageType::Internal;
-  case Linkage::VisibleNone:
-    return EntityLinkageType::Internal;
-  case Linkage::Module:
-    return EntityLinkageType::External;
-  case Linkage::External:
-    return EntityLinkageType::External;
-  }
-  llvm_unreachable("Unhandled clang::Linkage kind");
+  ASTContext &Ctx = ND->getASTContext();
+  return EntityLinkage(mapLinkage(ND), mapBinding(ND, Ctx), mapVisibility(ND),
+                       mapDefinitionKind(ND, Ctx), mapRetention(ND));
 }
 
 std::optional<EntityId> TUSummaryExtractor::addEntity(const NamedDecl *D) {
   auto Name = getEntityName(D);
   if (!Name)
     return std::nullopt;
-  return SummaryBuilder.addEntity(*Name, getLinkageForDecl(D));
+  return SummaryBuilder.addEntity(*Name, getEntityLinkageForDecl(D));
 }
 
 std::optional<EntityId>
@@ -72,7 +154,7 @@ TUSummaryExtractor::addEntityForReturn(const FunctionDecl *FD) {
   auto Name = getEntityNameForReturn(FD);
   if (!Name)
     return std::nullopt;
-  return SummaryBuilder.addEntity(*Name, getLinkageForDecl(FD));
+  return SummaryBuilder.addEntity(*Name, getEntityLinkageForDecl(FD));
 }
 
 const SSAFOptions &TUSummaryExtractor::getOptions() const {
diff --git a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-array.json b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-array.json
index 282917559e5b5..d23ebdb41289e 100644
--- a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-array.json
+++ b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-array.json
@@ -65,19 +65,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-summary.json b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-summary.json
index c2c5e119ca330..8d69f055c06bb 100644
--- a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-summary.json
+++ b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-bad-summary.json
@@ -42,19 +42,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-no-key.json b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-no-key.json
index 14c654f8b7c14..74b768c866572 100644
--- a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-no-key.json
+++ b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary-no-key.json
@@ -71,19 +71,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary.json b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary.json
index 9b0b4575e2f61..5fbb0834bbc37 100644
--- a/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary.json
+++ b/clang/test/Analysis/Scalable/PointerFlow/Inputs/tu-summary.json
@@ -68,19 +68,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-bad-id.json b/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-bad-id.json
index 286826682b050..f8e52ddd30305 100644
--- a/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-bad-id.json
+++ b/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-bad-id.json
@@ -27,7 +27,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-no-key.json b/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-no-key.json
index 3608117904567..5a55220e7384a 100644
--- a/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-no-key.json
+++ b/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary-no-key.json
@@ -25,7 +25,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary.json b/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary.json
index a6231439888c5..36c725d94719d 100644
--- a/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary.json
+++ b/clang/test/Analysis/Scalable/TypeConstrainedPointers/Inputs/tu-summary.json
@@ -46,19 +46,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-element.json b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-element.json
index 8e73183ce3b29..60a305c90134b 100644
--- a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-element.json
+++ b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-element.json
@@ -34,13 +34,21 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-ptr-level.json b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-ptr-level.json
index 9a4ef04219f0a..c387c8ba68729 100644
--- a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-ptr-level.json
+++ b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-bad-ptr-level.json
@@ -39,13 +39,21 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-no-key.json b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-no-key.json
index 0ab350fa56182..6090ddb4bf635 100644
--- a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-no-key.json
+++ b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary-no-key.json
@@ -39,13 +39,21 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary.json b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary.json
index e4df108408472..412e57d70be18 100644
--- a/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary.json
+++ b/clang/test/Analysis/Scalable/UnsafeBufferUsage/Inputs/tu-summary.json
@@ -82,19 +82,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu-tags-only.json b/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu-tags-only.json
index ddff7a789fffb..d4eb231001724 100644
--- a/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu-tags-only.json
+++ b/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu-tags-only.json
@@ -31,7 +31,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu.json b/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu.json
index 4654ada97a341..f917a9f6d10c6 100644
--- a/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu.json
+++ b/clang/test/Analysis/Scalable/ssaf-analyzer/Inputs/lu.json
@@ -101,19 +101,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Artifact/Inputs/rt-multi-arch-shared-library-nonempty.json b/clang/test/Analysis/Scalable/ssaf-format/Artifact/Inputs/rt-multi-arch-shared-library-nonempty.json
index dc00a24f0eaf0..ca4e315b5b3c3 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Artifact/Inputs/rt-multi-arch-shared-library-nonempty.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Artifact/Inputs/rt-multi-arch-shared-library-nonempty.json
@@ -21,7 +21,11 @@
         {
           "id": 0,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         }
       ],
@@ -55,7 +59,11 @@
         {
           "id": 0,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         }
       ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-element.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-element.json
index b726ec997917f..b195d804d31ab 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-element.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-element.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-id.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-id.json
index c4d8af0dbfcfc..5f247f6772cc4 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/invalid-direct-callee-id.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-col.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-col.json
index fb928fe397acc..f3b86ea870b92 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-col.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-col.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-file.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-file.json
index e43509f1f8ca4..21b001eaaace6 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-file.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-file.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-line.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-line.json
index dd14915d37aba..f450524d74ce0 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-line.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def-line.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def.json
index c0da9cd05f807..d9e37423da0e8 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-def.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-direct-callees.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-direct-callees.json
index 45262d5813200..d1d0b0c1f33e2 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-direct-callees.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-direct-callees.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-pretty-name.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-pretty-name.json
index b1e7de381a36a..c82a18177b605 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-pretty-name.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-pretty-name.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-virtual-callees.json b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-virtual-callees.json
index 02e313bdc67b0..a47863d025de6 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-virtual-callees.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/Inputs/CallGraph/missing-virtual-callees.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity-id-in-data-map.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity-id-in-data-map.json
index 08bda0ffa6c73..80dadae19663c 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity-id-in-data-map.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity-id-in-data-map.json
@@ -28,7 +28,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity.json
index 0d5e7d5b1eeec..c84da0969ab00 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/duplicate-entity.json
@@ -45,13 +45,21 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-namespace.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-namespace.json
index 174423ce72c33..1301c32fad54b 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-namespace.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-namespace.json
@@ -18,7 +18,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-suffix.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-suffix.json
index 92457c7f75d44..5866fb5a135db 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-suffix.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-suffix.json
@@ -23,7 +23,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-usr.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-usr.json
index a3af210d887b1..f5a2c386c27c3 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-usr.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/entity-name-missing-usr.json
@@ -27,7 +27,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-duplicate-id.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-duplicate-id.json
index e03fa76057044..b7ef1e02120cf 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-duplicate-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-duplicate-id.json
@@ -28,13 +28,21 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 0,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-id-not-uint64.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-id-not-uint64.json
index ae30fe240fb20..df248bc1be061 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-id-not-uint64.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-id-not-uint64.json
@@ -10,7 +10,11 @@
     {
       "id": "not_a_number",
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-linkage-invalid-type.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-linkage-invalid-type.json
index 7f53e39f1d942..76042f0b92e81 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-linkage-invalid-type.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-linkage-invalid-type.json
@@ -10,7 +10,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "invalid_type"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "invalid_type",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-missing-id.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-missing-id.json
index 73738e0a42255..bd76c4924bf48 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-missing-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-entry-missing-id.json
@@ -9,7 +9,11 @@
   "linkage_table": [
     {
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-extra-id.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-extra-id.json
index af1436f97df13..b15eaa38a7694 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-extra-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/linkage-table-extra-id.json
@@ -10,7 +10,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-invalid-kind.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-invalid-kind.json
index 6c648ca818656..4e9446677a59c 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-invalid-kind.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-invalid-kind.json
@@ -24,7 +24,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-kind.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-kind.json
index 004ff880ab480..33eaa309cfa9c 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-kind.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-kind.json
@@ -23,7 +23,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-name.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-name.json
index b35b6bb00da4b..dfbf2774e1554 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-name.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-missing-name.json
@@ -23,7 +23,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-not-object.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-not-object.json
index 00f88a4651d90..48986d61c8755 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-not-object.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/namespace-element-not-object.json
@@ -21,7 +21,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-external.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-external.json
index 1024caba971c7..a94855d7965ce 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-external.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-external.json
@@ -19,7 +19,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-internal.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-internal.json
index f4e9603d9bd0e..5f99b4ea56022 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-internal.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-internal.json
@@ -19,7 +19,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-multiple.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-multiple.json
index e2c333ffbc07a..75ff6ca8c53bf 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-multiple.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-multiple.json
@@ -45,19 +45,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-none.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-none.json
index 8330210158484..4e916dcb624c7 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-none.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-linkage-none.json
@@ -19,7 +19,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-two-summary-types.json b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-two-summary-types.json
index 3297419191ef8..6ccb8b4649e8e 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-two-summary-types.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/LUSummary/Inputs/rt-two-summary-types.json
@@ -203,31 +203,51 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/MultiArchSharedLibrary/Inputs/rt-nonempty-members.json b/clang/test/Analysis/Scalable/ssaf-format/MultiArchSharedLibrary/Inputs/rt-nonempty-members.json
index dc00a24f0eaf0..ca4e315b5b3c3 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/MultiArchSharedLibrary/Inputs/rt-nonempty-members.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/MultiArchSharedLibrary/Inputs/rt-nonempty-members.json
@@ -21,7 +21,11 @@
         {
           "id": 0,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         }
       ],
@@ -55,7 +59,11 @@
         {
           "id": 0,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         }
       ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity-id-in-data-map.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity-id-in-data-map.json
index a4d6723f0c595..6396a542f980d 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity-id-in-data-map.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity-id-in-data-map.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity.json
index 16e47f09d2a00..20088381437bd 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/duplicate-entity.json
@@ -22,11 +22,11 @@
   "linkage_table": [
     {
       "id": 0,
-      "linkage": { "type": "Internal" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "Internal", "visibility": "Default" }
     },
     {
       "id": 1,
-      "linkage": { "type": "External" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "External", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-suffix.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-suffix.json
index a9b793c706697..dd96ff4c812b2 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-suffix.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-suffix.json
@@ -14,7 +14,7 @@
   "linkage_table": [
     {
       "id": 0,
-      "linkage": { "type": "External" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "External", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-usr.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-usr.json
index d32cf5c7ff188..da7dd2d3db283 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-usr.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/entity-name-missing-usr.json
@@ -14,7 +14,7 @@
   "linkage_table": [
     {
       "id": 0,
-      "linkage": { "type": "Internal" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "Internal", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/id-table-entry-missing-name.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/id-table-entry-missing-name.json
index 12b52496f3c04..1d8cce33b5609 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/id-table-entry-missing-name.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/id-table-entry-missing-name.json
@@ -11,7 +11,7 @@
   "linkage_table": [
     {
       "id": 0,
-      "linkage": { "type": "None" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "None", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-duplicate-id.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-duplicate-id.json
index 2e3cd065e82d9..648c808c65cc2 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-duplicate-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-duplicate-id.json
@@ -15,11 +15,11 @@
   "linkage_table": [
     {
       "id": 0,
-      "linkage": { "type": "External" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "External", "visibility": "Default" }
     },
     {
       "id": 0,
-      "linkage": { "type": "Internal" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "Internal", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-id-not-uint64.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-id-not-uint64.json
index fde6f8b169cda..e386909c52bdd 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-id-not-uint64.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-id-not-uint64.json
@@ -7,7 +7,7 @@
   "linkage_table": [
     {
       "id": "not_a_number",
-      "linkage": { "type": "External" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "External", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-missing-id.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-missing-id.json
index 597db631bfd60..9798466e5c4de 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-missing-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-entry-missing-id.json
@@ -6,7 +6,7 @@
   "id_table": [],
   "linkage_table": [
     {
-      "linkage": { "type": "External" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "External", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-extra-id.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-extra-id.json
index e0d15d64a0d26..0bebddf3d7596 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-extra-id.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/linkage-table-extra-id.json
@@ -7,7 +7,7 @@
   "linkage_table": [
     {
       "id": 0,
-      "linkage": { "type": "External" }
+      "linkage": { "binding": "Strong", "definition": "Definition", "retention": "NotRetained", "type": "External", "visibility": "Default" }
     }
   ],
   "data": [],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-external.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-external.json
index bb26bc0de603a..52947a3cf2c34 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-external.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-external.json
@@ -13,7 +13,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-internal.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-internal.json
index f3aa427a9e239..8f27559170cea 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-internal.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-internal.json
@@ -13,7 +13,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-multiple.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-multiple.json
index c22c932ad2882..5a2dc5bc88631 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-multiple.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-multiple.json
@@ -27,19 +27,31 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-none.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-none.json
index 495890dc3cc44..f1e771f9b941c 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-none.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-linkage-none.json
@@ -13,7 +13,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-two-summary-types.json b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-two-summary-types.json
index 080afccbdf482..b0134ffa929f3 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-two-summary-types.json
+++ b/clang/test/Analysis/Scalable/ssaf-format/TUSummary/Inputs/rt-two-summary-types.json
@@ -173,31 +173,51 @@
     {
       "id": 0,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-1.json b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-1.json
index 0fe78af8c28bb..69c7a477b765b 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-1.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-1.json
@@ -51,37 +51,61 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 5,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-2.json b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-2.json
index 48a7fbef570e6..03e5cfcc49a71 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-2.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-2.json
@@ -51,37 +51,61 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 5,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-multikey.json b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-multikey.json
index a66be3036e31f..dcffdea3a0a89 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-multikey.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-multikey.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-ref.json b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-ref.json
index 535cc18dc10d5..3af385b41d8a2 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-ref.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-ref.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-value.json b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-value.json
index 1fd3d1aeb0ac9..42996875352b5 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-value.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Inputs/tu-invalid-entity-id-value.json
@@ -16,7 +16,11 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/libtwo.json b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/libtwo.json
index 7c4d80720ec57..c0ea3dae454f1 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/libtwo.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/libtwo.json
@@ -271,37 +271,61 @@
         {
           "id": 0,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         },
         {
           "id": 1,
           "linkage": {
-            "type": "Internal"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "Internal",
+            "visibility": "Default"
           }
         },
         {
           "id": 2,
           "linkage": {
-            "type": "None"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "None",
+            "visibility": "Default"
           }
         },
         {
           "id": 3,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         },
         {
           "id": 4,
           "linkage": {
-            "type": "Internal"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "Internal",
+            "visibility": "Default"
           }
         },
         {
           "id": 5,
           "linkage": {
-            "type": "None"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "None",
+            "visibility": "Default"
           }
         }
       ],
@@ -589,37 +613,61 @@
         {
           "id": 0,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         },
         {
           "id": 1,
           "linkage": {
-            "type": "Internal"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "Internal",
+            "visibility": "Default"
           }
         },
         {
           "id": 2,
           "linkage": {
-            "type": "None"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "None",
+            "visibility": "Default"
           }
         },
         {
           "id": 3,
           "linkage": {
-            "type": "External"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "External",
+            "visibility": "Default"
           }
         },
         {
           "id": 4,
           "linkage": {
-            "type": "Internal"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "Internal",
+            "visibility": "Default"
           }
         },
         {
           "id": 5,
           "linkage": {
-            "type": "None"
+            "binding": "Strong",
+            "definition": "Definition",
+            "retention": "NotRetained",
+            "type": "None",
+            "visibility": "Default"
           }
         }
       ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1+2.json b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1+2.json
index 663f5dd814534..18608f17f58e6 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1+2.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1+2.json
@@ -579,67 +579,111 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 5,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 6,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 7,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 8,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 9,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 10,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1.json b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1.json
index 4fd99f978148b..3d44d8c2d2eb6 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-1.json
@@ -321,37 +321,61 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 5,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-2.json b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-2.json
index e7fd3f39da0c1..c327a39854bcc 100644
--- a/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-2.json
+++ b/clang/test/Analysis/Scalable/ssaf-linker/Outputs/lu-2.json
@@ -327,37 +327,61 @@
     {
       "id": 0,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 1,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 2,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     },
     {
       "id": 3,
       "linkage": {
-        "type": "External"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "External",
+        "visibility": "Default"
       }
     },
     {
       "id": 4,
       "linkage": {
-        "type": "Internal"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "Internal",
+        "visibility": "Default"
       }
     },
     {
       "id": 5,
       "linkage": {
-        "type": "None"
+        "binding": "Strong",
+        "definition": "Definition",
+        "retention": "NotRetained",
+        "type": "None",
+        "visibility": "Default"
       }
     }
   ],
diff --git a/clang/unittests/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlowWPATest.cpp b/clang/unittests/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlowWPATest.cpp
index 8c43ead9750ca..20ec62a52d68a 100644
--- a/clang/unittests/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlowWPATest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlowWPATest.cpp
@@ -33,8 +33,11 @@ namespace {
 
 class PointerFlowWPATest : public TestFixture {
 protected:
-  static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+  static constexpr EntityLinkage ExternalLinkage = EntityLinkage(
+      EntityLinkageType::External, clang::ssaf::EntityBinding::Strong,
+      clang::ssaf::EntityVisibility::Default,
+      clang::ssaf::EntityDefinitionKind::Definition,
+      clang::ssaf::EntityRetention::NotRetained);
 
   std::unique_ptr<LUSummary> makeLUSummary() {
     NestedBuildNamespace NS(
diff --git a/clang/unittests/ScalableStaticAnalysis/Analyses/UnsafeBufferUsage/UnsafeBufferUsageWPATest.cpp b/clang/unittests/ScalableStaticAnalysis/Analyses/UnsafeBufferUsage/UnsafeBufferUsageWPATest.cpp
index 448f838297e8f..28d9d662498a4 100644
--- a/clang/unittests/ScalableStaticAnalysis/Analyses/UnsafeBufferUsage/UnsafeBufferUsageWPATest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/Analyses/UnsafeBufferUsage/UnsafeBufferUsageWPATest.cpp
@@ -34,8 +34,11 @@ namespace {
 
 class UnsafeBufferUsageWPATest : public TestFixture {
 protected:
-  static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+  static constexpr EntityLinkage ExternalLinkage = EntityLinkage(
+      EntityLinkageType::External, clang::ssaf::EntityBinding::Strong,
+      clang::ssaf::EntityVisibility::Default,
+      clang::ssaf::EntityDefinitionKind::Definition,
+      clang::ssaf::EntityRetention::NotRetained);
 
   std::unique_ptr<LUSummary> makeLUSummary() {
     NestedBuildNamespace NS(
diff --git a/clang/unittests/ScalableStaticAnalysis/EntityLinkageTest.cpp b/clang/unittests/ScalableStaticAnalysis/EntityLinkageTest.cpp
index ccf38ec8d93fb..06316f9fc4eb6 100644
--- a/clang/unittests/ScalableStaticAnalysis/EntityLinkageTest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/EntityLinkageTest.cpp
@@ -12,8 +12,12 @@
 #include "llvm/Support/raw_ostream.h"
 #include "gtest/gtest.h"
 
+using clang::ssaf::EntityBinding;
+using clang::ssaf::EntityDefinitionKind;
 using clang::ssaf::EntityLinkage;
 using clang::ssaf::EntityLinkageType;
+using clang::ssaf::EntityRetention;
+using clang::ssaf::EntityVisibility;
 
 namespace {
 
@@ -21,44 +25,68 @@ constexpr inline auto None = EntityLinkageType::None;
 constexpr inline auto Internal = EntityLinkageType::Internal;
 constexpr inline auto External = EntityLinkageType::External;
 
-TEST(EntityLinkageTest, Constructor) {
-  EntityLinkage NoneLinkage(None);
-  EntityLinkage InternalLinkage(Internal);
-  EntityLinkage ExternalLinkage(External);
+// Builds an EntityLinkage with the given linkage type and fixed defaults for
+// the remaining properties (an ordinary strong external definition).
+constexpr EntityLinkage mk(EntityLinkageType LT) {
+  return EntityLinkage(LT, EntityBinding::Strong, EntityVisibility::Default,
+                       EntityDefinitionKind::Definition,
+                       EntityRetention::NotRetained);
+}
 
-  EXPECT_EQ(NoneLinkage.getLinkage(), None);
-  EXPECT_EQ(InternalLinkage.getLinkage(), Internal);
-  EXPECT_EQ(ExternalLinkage.getLinkage(), External);
+TEST(EntityLinkageTest, Constructor) {
+  EntityLinkage L(External, EntityBinding::WeakODR, EntityVisibility::Hidden,
+                  EntityDefinitionKind::Declaration, EntityRetention::Retained);
+  EXPECT_EQ(L.getLinkage(), External);
 }
 
 TEST(EntityLinkageTest, CopyConstructor) {
-  EntityLinkage Original(External);
+  EntityLinkage Original = mk(External);
   EntityLinkage Copy = Original;
 
-  EXPECT_EQ(Copy.getLinkage(), External);
-  EXPECT_EQ(Copy.getLinkage(), Original.getLinkage());
+  EXPECT_EQ(Copy, Original);
 }
 
 TEST(EntityLinkageTest, AssignmentOperator) {
-  EntityLinkage Linkage1(None);
-  EntityLinkage Linkage2(External);
+  EntityLinkage Linkage1 = mk(None);
+  EntityLinkage Linkage2 = mk(External);
 
   Linkage1 = Linkage2;
 
-  EXPECT_EQ(Linkage1.getLinkage(), External);
-  EXPECT_EQ(Linkage1.getLinkage(), Linkage2.getLinkage());
+  EXPECT_EQ(Linkage1, Linkage2);
 }
 
 TEST(EntityLinkageTest, EqualityOperatorReflexive) {
-  EXPECT_EQ(EntityLinkage(None), EntityLinkage(None));
-  EXPECT_EQ(EntityLinkage(Internal), EntityLinkage(Internal));
-  EXPECT_EQ(EntityLinkage(External), EntityLinkage(External));
+  EXPECT_EQ(mk(None), mk(None));
+  EXPECT_EQ(mk(Internal), mk(Internal));
+  EXPECT_EQ(mk(External), mk(External));
 }
 
 TEST(EntityLinkageTest, EqualityOperatorDistinct) {
-  EXPECT_NE(EntityLinkage(None), EntityLinkage(Internal));
-  EXPECT_NE(EntityLinkage(None), EntityLinkage(External));
-  EXPECT_NE(EntityLinkage(Internal), EntityLinkage(External));
+  EXPECT_NE(mk(None), mk(Internal));
+  EXPECT_NE(mk(None), mk(External));
+  EXPECT_NE(mk(Internal), mk(External));
+}
+
+TEST(EntityLinkageTest, EqualityConsidersAllProperties) {
+  const EntityLinkage Base(
+      External, EntityBinding::Strong, EntityVisibility::Default,
+      EntityDefinitionKind::Definition, EntityRetention::NotRetained);
+  EXPECT_NE(Base, EntityLinkage(External, EntityBinding::Weak,
+                                EntityVisibility::Default,
+                                EntityDefinitionKind::Definition,
+                                EntityRetention::NotRetained));
+  EXPECT_NE(Base, EntityLinkage(External, EntityBinding::Strong,
+                                EntityVisibility::Hidden,
+                                EntityDefinitionKind::Definition,
+                                EntityRetention::NotRetained));
+  EXPECT_NE(Base, EntityLinkage(External, EntityBinding::Strong,
+                                EntityVisibility::Default,
+                                EntityDefinitionKind::Declaration,
+                                EntityRetention::NotRetained));
+  EXPECT_NE(Base, EntityLinkage(External, EntityBinding::Strong,
+                                EntityVisibility::Default,
+                                EntityDefinitionKind::Definition,
+                                EntityRetention::Retained));
 }
 
 TEST(EntityLinkageTypeTest, FormatProvider) {
@@ -88,30 +116,17 @@ TEST(EntityLinkageTypeTest, StreamOutputExternal) {
 }
 
 TEST(EntityLinkageTest, FormatProvider) {
-  EXPECT_EQ(llvm::formatv("{0}", EntityLinkage(None)).str(),
-            "EntityLinkage(None)");
-  EXPECT_EQ(llvm::formatv("{0}", EntityLinkage(Internal)).str(),
-            "EntityLinkage(Internal)");
-  EXPECT_EQ(llvm::formatv("{0}", EntityLinkage(External)).str(),
-            "EntityLinkage(External)");
-}
-
-TEST(EntityLinkageTest, StreamOutputNone) {
-  std::string S;
-  llvm::raw_string_ostream(S) << EntityLinkage(None);
-  EXPECT_EQ(S, "EntityLinkage(None)");
-}
-
-TEST(EntityLinkageTest, StreamOutputInternal) {
-  std::string S;
-  llvm::raw_string_ostream(S) << EntityLinkage(Internal);
-  EXPECT_EQ(S, "EntityLinkage(Internal)");
+  EXPECT_EQ(llvm::formatv("{0}", mk(None)).str(),
+            "EntityLinkage(None, Strong, Default, Definition, NotRetained)");
 }
 
-TEST(EntityLinkageTest, StreamOutputExternal) {
+TEST(EntityLinkageTest, StreamOutput) {
   std::string S;
-  llvm::raw_string_ostream(S) << EntityLinkage(External);
-  EXPECT_EQ(S, "EntityLinkage(External)");
+  llvm::raw_string_ostream(S) << EntityLinkage(
+      External, EntityBinding::WeakODR, EntityVisibility::Hidden,
+      EntityDefinitionKind::Declaration, EntityRetention::Retained);
+  EXPECT_EQ(S,
+            "EntityLinkage(External, WeakODR, Hidden, Declaration, Retained)");
 }
 
 } // namespace
diff --git a/clang/unittests/ScalableStaticAnalysis/EntityLinkerTest.cpp b/clang/unittests/ScalableStaticAnalysis/EntityLinkerTest.cpp
index cd579e16991ef..e6e727d446b0b 100644
--- a/clang/unittests/ScalableStaticAnalysis/EntityLinkerTest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/EntityLinkerTest.cpp
@@ -57,12 +57,17 @@ size_t MockEntitySummaryEncoding::Index = 0;
 
 class EntityLinkerTest : public TestFixture {
 protected:
-  static constexpr EntityLinkage NoneLinkage =
-      EntityLinkage(EntityLinkageType::None);
+  static constexpr EntityLinkage NoneLinkage = EntityLinkage(
+      EntityLinkageType::None, EntityBinding::Strong, EntityVisibility::Default,
+      EntityDefinitionKind::Definition, EntityRetention::NotRetained);
   static constexpr EntityLinkage InternalLinkage =
-      EntityLinkage(EntityLinkageType::Internal);
+      EntityLinkage(EntityLinkageType::Internal, EntityBinding::Strong,
+                    EntityVisibility::Default, EntityDefinitionKind::Definition,
+                    EntityRetention::NotRetained);
   static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+      EntityLinkage(EntityLinkageType::External, EntityBinding::Strong,
+                    EntityVisibility::Default, EntityDefinitionKind::Definition,
+                    EntityRetention::NotRetained);
 
   void SetUp() override {
     // This ensures that the MockEntitySummary id assignment does not
diff --git a/clang/unittests/ScalableStaticAnalysis/Serialization/JSONFormatTest/SharedLexicalRepresentationFormatTest.cpp b/clang/unittests/ScalableStaticAnalysis/Serialization/JSONFormatTest/SharedLexicalRepresentationFormatTest.cpp
index 11c388de21157..8dab35f57555a 100644
--- a/clang/unittests/ScalableStaticAnalysis/Serialization/JSONFormatTest/SharedLexicalRepresentationFormatTest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/Serialization/JSONFormatTest/SharedLexicalRepresentationFormatTest.cpp
@@ -74,8 +74,11 @@ TEST(EntitySourceLocationsSummaryTest, EmptyByDefault) {
 
 class SharedLexicalRepresentationFormatTest : public JSONFormatTest {
 protected:
-  static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+  static constexpr EntityLinkage ExternalLinkage = EntityLinkage(
+      EntityLinkageType::External, clang::ssaf::EntityBinding::Strong,
+      clang::ssaf::EntityVisibility::Default,
+      clang::ssaf::EntityDefinitionKind::Definition,
+      clang::ssaf::EntityRetention::NotRetained);
 
   std::unique_ptr<LUSummary> makeLUSummary() {
     NestedBuildNamespace NS(
diff --git a/clang/unittests/ScalableStaticAnalysis/SummaryData/SummaryDataTest.cpp b/clang/unittests/ScalableStaticAnalysis/SummaryData/SummaryDataTest.cpp
index e8137f3bac308..57d388b95e933 100644
--- a/clang/unittests/ScalableStaticAnalysis/SummaryData/SummaryDataTest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/SummaryData/SummaryDataTest.cpp
@@ -171,8 +171,11 @@ static SummaryDataBuilderRegistry::Add<Analysis4Builder>
 
 class LUSummaryConsumerTest : public TestFixture {
 protected:
-  static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+  static constexpr EntityLinkage ExternalLinkage = EntityLinkage(
+      EntityLinkageType::External, clang::ssaf::EntityBinding::Strong,
+      clang::ssaf::EntityVisibility::Default,
+      clang::ssaf::EntityDefinitionKind::Definition,
+      clang::ssaf::EntityRetention::NotRetained);
 
   void SetUp() override {
     NextSummaryInstanceId = 0;
diff --git a/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/AnalysisDriverTest.cpp b/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/AnalysisDriverTest.cpp
index 9e518f08cc7de..2880a631351df 100644
--- a/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/AnalysisDriverTest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/AnalysisDriverTest.cpp
@@ -289,8 +289,11 @@ static AnalysisRegistry::Add<CycleB> RegCycleB("Cyclic analysis B (test only)");
 
 class AnalysisDriverTest : public TestFixture {
 protected:
-  static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+  static constexpr EntityLinkage ExternalLinkage = EntityLinkage(
+      EntityLinkageType::External, clang::ssaf::EntityBinding::Strong,
+      clang::ssaf::EntityVisibility::Default,
+      clang::ssaf::EntityDefinitionKind::Definition,
+      clang::ssaf::EntityRetention::NotRetained);
 
   void SetUp() override {
     NextSummaryInstanceId = 0;
diff --git a/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/UnsafeBufferReachableAnalysisTest.cpp b/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/UnsafeBufferReachableAnalysisTest.cpp
index cf5420b35e7dc..fcf7a7f839085 100644
--- a/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/UnsafeBufferReachableAnalysisTest.cpp
+++ b/clang/unittests/ScalableStaticAnalysis/WholeProgramAnalysis/UnsafeBufferReachableAnalysisTest.cpp
@@ -40,8 +40,11 @@ class UnsafeBufferReachableAnalysisTest : public TestFixture {
 protected:
   using EPLEdge = std::pair<EntityPointerLevel, EntityPointerLevel>;
 
-  static constexpr EntityLinkage ExternalLinkage =
-      EntityLinkage(EntityLinkageType::External);
+  static constexpr EntityLinkage ExternalLinkage = EntityLinkage(
+      EntityLinkageType::External, clang::ssaf::EntityBinding::Strong,
+      clang::ssaf::EntityVisibility::Default,
+      clang::ssaf::EntityDefinitionKind::Definition,
+      clang::ssaf::EntityRetention::NotRetained);
 
   std::unique_ptr<LUSummary> makeLUSummary() {
     NestedBuildNamespace NS(



More information about the cfe-commits mailing list