[clang] [llvm] [clang][ssaf][NFC] Move SSAF from Analysis/Scalable/ to ScalableStaticAnalysisFramework/ (PR #186156)

[via cfe-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-ssaf

Author: Balázs Benics (steakhal)

<details>
<summary>Changes</summary>

- Rename `clang/{include,lib,unittests}/Analysis/Scalable/` to `clang/{include,lib,unittests}/ScalableStaticAnalysisFramework/Core/`
- Update header-guards with their new paths
- Rename the library `clangAnalysisScalable` to `clangScalableStaticAnalysisFrameworkCore`
- Add a new `Clang_ScalableStaticAnalysisFramework` module to `module.modulemap`
- Update GN build files, GitHub PR labeler, and documentation

---

Patch is 109.42 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/186156.diff


90 Files Affected:

- (modified) .github/new-prs-labeler.yml (+3-3) 
- (modified) clang/docs/ScalableStaticAnalysisFramework/developer-docs/ForceLinkerHeaders.rst (+7-7) 
- (modified) clang/docs/ScalableStaticAnalysisFramework/developer-docs/HowToExtend.rst (+8-8) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/ASTEntityMapping.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h (+6-6) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h (+6-5) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/BuildNamespace.h (+3-3) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityId.h (+3-3) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityIdTable.h (+5-5) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityLinkage.h (+3-3) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityName.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/PrivateFieldNames.def (+1-1) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/SummaryName.h (+3-3) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat.h (+5-5) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormat.h (+11-11) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormatRegistry.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Support/ErrorBuilder.h (+3-3) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/Support/FormatProviders.h (+9-9) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/TUSummary/EntitySummary.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/TUSummary/ExtractorRegistry.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/TUSummary/TUSummary.h (+10-10) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/TUSummary/TUSummaryBuilder.h (+5-5) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/Core/TUSummary/TUSummaryExtractor.h (+3-3) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/EntityLinker/EntityLinker.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/EntityLinker/EntitySummaryEncoding.h (+4-4) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/EntityLinker/LUSummary.h (+10-10) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/EntityLinker/LUSummaryEncoding.h (+10-10) 
- (renamed) clang/include/clang/ScalableStaticAnalysisFramework/EntityLinker/TUSummaryEncoding.h (+10-10) 
- (modified) clang/include/module.modulemap (+9-2) 
- (modified) clang/lib/Analysis/CMakeLists.txt (-1) 
- (modified) clang/lib/CMakeLists.txt (+1) 
- (added) clang/lib/ScalableStaticAnalysisFramework/CMakeLists.txt (+1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/ASTEntityMapping.cpp (+2-2) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/CMakeLists.txt (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/EntityLinker/EntityLinker.cpp (+7-7) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Model/BuildNamespace.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Model/EntityId.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Model/EntityIdTable.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Model/EntityLinkage.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Model/EntityName.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Model/SummaryName.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/ModelStringConversions.h (+2-2) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/JSONEntitySummaryEncoding.cpp () 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/JSONEntitySummaryEncoding.h (+2-2) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/JSONFormatImpl.cpp (+2-2) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/JSONFormatImpl.h (+5-5) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/LUSummary.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/LUSummaryEncoding.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/TUSummary.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/JSONFormat/TUSummaryEncoding.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormatRegistry.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/Support/ErrorBuilder.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/TUSummary/ExtractorRegistry.cpp (+1-1) 
- (renamed) clang/lib/ScalableStaticAnalysisFramework/Core/TUSummary/TUSummaryBuilder.cpp (+4-4) 
- (modified) clang/tools/ssaf-format/CMakeLists.txt (+1-1) 
- (modified) clang/tools/ssaf-format/SSAFFormat.cpp (+4-4) 
- (modified) clang/tools/ssaf-linker/CMakeLists.txt (+1-1) 
- (modified) clang/tools/ssaf-linker/SSAFLinker.cpp (+6-6) 
- (modified) clang/unittests/Analysis/CMakeLists.txt (-1) 
- (modified) clang/unittests/CMakeLists.txt (+1) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/ASTEntityMappingTest.cpp (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Analyses/UnsafeBufferUsage/UnsafeBufferUsageTest.cpp (+5-5) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/BuildNamespaceTest.cpp (+3-3) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/CMakeLists.txt (+3-1) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/EntityIdTableTest.cpp (+5-5) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/EntityIdTest.cpp (+5-5) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/EntityLinkageTest.cpp (+3-3) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/EntityLinkerTest.cpp (+11-11) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/EntityNameTest.cpp (+4-4) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/ErrorBuilderTest.cpp (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/ModelStringConversionsTest.cpp (+1-1) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/FancyAnalysisData.cpp (+1-1) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/MockSerializationFormat.cpp (+9-9) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/MockSerializationFormat.h (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/MockSummaryExtractor1.cpp (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/MockSummaryExtractor2.cpp (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/MockTUSummaryBuilder.h (+1-1) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/SerializationFormatRegistryTest.cpp (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Registries/SummaryExtractorRegistryTest.cpp (+2-2) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Serialization/JSONFormatTest/JSONFormatTest.cpp (+1-1) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Serialization/JSONFormatTest/JSONFormatTest.h () 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Serialization/JSONFormatTest/LUSummaryTest.cpp (+3-3) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/Serialization/JSONFormatTest/TUSummaryTest.cpp (+3-3) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/SummaryNameTest.cpp (+3-3) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/TUSummaryBuilderTest.cpp (+9-9) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/TestFixture.cpp (+6-6) 
- (renamed) clang/unittests/ScalableStaticAnalysisFramework/TestFixture.h (+11-11) 
- (renamed) llvm/utils/gn/secondary/clang/lib/ScalableStaticAnalysisFramework/Core/BUILD.gn (+2-2) 
- (modified) llvm/utils/gn/secondary/clang/unittests/BUILD.gn (+1-1) 
- (renamed) llvm/utils/gn/secondary/clang/unittests/ScalableStaticAnalysisFramework/BUILD.gn (+1-1) 


``````````diff
diff --git a/.github/new-prs-labeler.yml b/.github/new-prs-labeler.yml
index 7daac40b6d6fe..774feaed16fb0 100644
--- a/.github/new-prs-labeler.yml
+++ b/.github/new-prs-labeler.yml
@@ -692,10 +692,10 @@ clang:analysis:
 clang:ssaf:
   - changed-files:
     - any-glob-to-any-file:
-      - clang/include/clang/Analysis/Scalable/**
-      - clang/lib/Analysis/Scalable/**
-      - clang/unittests/Analysis/Scalable/**
       - clang/docs/ScalableStaticAnalysisFramework/**
+      - clang/include/clang/ScalableStaticAnalysisFramework/**
+      - clang/lib/ScalableStaticAnalysisFramework/**
+      - clang/unittests/ScalableStaticAnalysisFramework/**
 
 clang:static analyzer:
   - changed-files:
diff --git a/clang/docs/ScalableStaticAnalysisFramework/developer-docs/ForceLinkerHeaders.rst b/clang/docs/ScalableStaticAnalysisFramework/developer-docs/ForceLinkerHeaders.rst
index 16ca0ea714d69..c04b2b786308f 100644
--- a/clang/docs/ScalableStaticAnalysisFramework/developer-docs/ForceLinkerHeaders.rst
+++ b/clang/docs/ScalableStaticAnalysisFramework/developer-docs/ForceLinkerHeaders.rst
@@ -66,21 +66,21 @@ Header hierarchy
   SSAFForceLinker.h                   (umbrella — include this in binaries)
   └── SSAFBuiltinForceLinker.h        (upstream built-in anchors only)
 
-- ``clang/include/clang/Analysis/Scalable/SSAFBuiltinForceLinker.h`` — anchors for
+- ``clang/include/clang/ScalableStaticAnalysisFramework/SSAFBuiltinForceLinker.h`` — anchors for
   upstream-provided (built-in) extractors and formats (e.g. ``JSONFormat``).
-- ``clang/include/clang/Analysis/Scalable/SSAFForceLinker.h`` — umbrella header
+- ``clang/include/clang/ScalableStaticAnalysisFramework/SSAFForceLinker.h`` — umbrella header
   that includes ``SSAFBuiltinForceLinker.h``.  This is the header that
   downstream projects should modify to add their own force-linker includes
   (see :doc:`HowToExtend`).
 
 Include the umbrella header with ``// IWYU pragma: keep`` in any translation
 unit that must guarantee all registrations are active — typically the entry
-point of a binary that uses ``clangAnalysisScalable``:
+point of a binary that uses ``clangScalableStaticAnalysisFrameworkCore``:
 
 .. code-block:: c++
 
   // In ExecuteCompilerInvocation.cpp
-  #include "clang/Analysis/Scalable/SSAFForceLinker.h" // IWYU pragma: keep
+  #include "clang/ScalableStaticAnalysisFramework/SSAFForceLinker.h" // IWYU pragma: keep
 
 Naming convention
 =================
@@ -103,10 +103,10 @@ library, regardless of whether any symbols are referenced:
 .. code-block:: bash
 
   # GNU ld / lld (Linux, BSD)
-  -Wl,--whole-archive -lclangAnalysisScalable -Wl,--no-whole-archive
+  -Wl,--whole-archive -lclangScalableStaticAnalysisFrameworkCore -Wl,--no-whole-archive
 
   # Apple ld
-  -Wl,-force_load,libclangAnalysisScalable.a
+  -Wl,-force_load,libclangScalableStaticAnalysisFrameworkCore.a
 
 Since CMake 3.24, the ``$<LINK_LIBRARY:WHOLE_ARCHIVE,...>`` generator expression
 provides a portable way to do the same:
@@ -114,7 +114,7 @@ provides a portable way to do the same:
 .. code-block:: cmake
 
   target_link_libraries(clang PRIVATE
-    "$<LINK_LIBRARY:WHOLE_ARCHIVE,clangAnalysisScalable>")
+    "$<LINK_LIBRARY:WHOLE_ARCHIVE,clangScalableStaticAnalysisFrameworkCore>")
 
 **Why we did not choose this approach**:
 
diff --git a/clang/docs/ScalableStaticAnalysisFramework/developer-docs/HowToExtend.rst b/clang/docs/ScalableStaticAnalysisFramework/developer-docs/HowToExtend.rst
index 840bca171fb48..7d92d7e6f2de7 100644
--- a/clang/docs/ScalableStaticAnalysisFramework/developer-docs/HowToExtend.rst
+++ b/clang/docs/ScalableStaticAnalysisFramework/developer-docs/HowToExtend.rst
@@ -10,7 +10,7 @@ SSAF is designed to be extensible with new **summary extractors** and **serializ
 Extensions can be added in three ways:
 
 #. **Statically, in-tree** — built as part of the upstream LLVM/Clang tree.
-#. **Statically, out-of-tree (downstream)** — built in a downstream fork or project that links ``clangAnalysisScalable`` as a static library.
+#. **Statically, out-of-tree (downstream)** — built in a downstream fork or project that links ``clangScalableStaticAnalysisFrameworkCore`` as a static library.
 #. **Dynamically, via plugins** — loaded at runtime as shared objects.
 
 All three approaches use the same ``llvm::Registry``-based registration mechanism.
@@ -28,7 +28,7 @@ Step 1: Implement the extractor
 .. code-block:: c++
 
   //--- MyExtractor.h
-  #include "clang/Analysis/Scalable/TUSummary/TUSummaryExtractor.h"
+  #include "clang/ScalableStaticAnalysisFramework/Core/TUSummary/TUSummaryExtractor.h"
 
   namespace clang::ssaf {
 
@@ -49,7 +49,7 @@ Step 2: Register the extractor
 
   //--- MyExtractor.cpp
   #include "MyExtractor.h"
-  #include "clang/Analysis/Scalable/TUSummary/ExtractorRegistry.h"
+  #include "clang/ScalableStaticAnalysisFramework/Core/TUSummary/ExtractorRegistry.h"
 
   using namespace clang::ssaf;
 
@@ -74,7 +74,7 @@ Add the following to the appropriate force-linker header:
       SSAFMyExtractorAnchorSource;
 
 For **in-tree** additions, add this to
-``clang/include/clang/Analysis/Scalable/SSAFBuiltinForceLinker.h``.
+``clang/include/clang/ScalableStaticAnalysisFramework/SSAFBuiltinForceLinker.h``.
 
 For **downstream** additions, see `Out-of-tree (downstream) extensions`_ below.
 
@@ -93,7 +93,7 @@ Your format class must inherit from ``SerializationFormat`` and define a ``Forma
 .. code-block:: c++
 
   //--- MyFormat.h
-  #include "clang/Analysis/Scalable/Serialization/SerializationFormat.h"
+  #include "clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormat.h"
   #include "clang/Support/Compiler.h"
   #include "llvm/Support/Registry.h"
 
@@ -121,7 +121,7 @@ Step 2: Register the format
 
   //--- MyFormat.cpp
   #include "MyFormat.h"
-  #include "clang/Analysis/Scalable/Serialization/SerializationFormatRegistry.h"
+  #include "clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormatRegistry.h"
 
   using namespace clang::ssaf;
 
@@ -172,8 +172,8 @@ In-tree extensions
 
 For extensions that are part of the upstream LLVM/Clang tree:
 
-#. Add the anchor to ``clang/include/clang/Analysis/Scalable/SSAFBuiltinForceLinker.h``.
-#. Add the source files to the ``clangAnalysisScalable`` CMake library target.
+#. Add the anchor to ``clang/include/clang/ScalableStaticAnalysisFramework/SSAFBuiltinForceLinker.h``.
+#. Add the source files to the ``clangScalableStaticAnalysisFrameworkCore`` CMake library target.
 #. That's it — the ``SSAFForceLinker.h`` umbrella includes ``SSAFBuiltinForceLinker.h``
    transitively, so any binary that includes the umbrella will pull in the registration.
 
diff --git a/clang/include/clang/Analysis/Scalable/ASTEntityMapping.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/ASTEntityMapping.h
similarity index 82%
rename from clang/include/clang/Analysis/Scalable/ASTEntityMapping.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/ASTEntityMapping.h
index 0e5fc204c5f1b..5057f8ac4505f 100644
--- a/clang/include/clang/Analysis/Scalable/ASTEntityMapping.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/ASTEntityMapping.h
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_ASTENTITYMAPPING_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_ASTENTITYMAPPING_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ASTENTITYMAPPING_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ASTENTITYMAPPING_H
 
 #include "clang/AST/Decl.h"
-#include "clang/Analysis/Scalable/Model/EntityName.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/Model/EntityName.h"
 #include "llvm/ADT/StringRef.h"
 #include <optional>
 
@@ -44,4 +44,4 @@ std::optional<EntityName> getEntityNameForReturn(const FunctionDecl *FD);
 
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_ASTENTITYMAPPING_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ASTENTITYMAPPING_H
diff --git a/clang/include/clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h
similarity index 88%
rename from clang/include/clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h
index cae722c837ab0..5b58ed0684333 100644
--- a/clang/include/clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGE_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGE_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGE_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGE_H
 
-#include "clang/Analysis/Scalable/Model/EntityId.h"
-#include "clang/Analysis/Scalable/Model/SummaryName.h"
-#include "clang/Analysis/Scalable/TUSummary/EntitySummary.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/Model/EntityId.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/Model/SummaryName.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/TUSummary/EntitySummary.h"
 #include "llvm/ADT/iterator_range.h"
 #include <set>
 
@@ -117,4 +117,4 @@ class UnsafeBufferUsageEntitySummary final : public EntitySummary {
 };
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGE_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGE_H
diff --git a/clang/include/clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h
similarity index 65%
rename from clang/include/clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h
index 1465068ab6840..db6c097510a57 100644
--- a/clang/include/clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsageBuilder.h
@@ -5,11 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGEBUILDER_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGEBUILDER_H
 
-#include "clang/Analysis/Scalable/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h"
-#include "clang/Analysis/Scalable/TUSummary/TUSummaryBuilder.h"
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGEBUILDER_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGEBUILDER_H
+
+#include "clang/ScalableStaticAnalysisFramework/Core/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/TUSummary/TUSummaryBuilder.h"
 #include <memory>
 
 namespace clang::ssaf {
@@ -28,4 +29,4 @@ class UnsafeBufferUsageTUSummaryBuilder : public TUSummaryBuilder {
 };
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGEBUILDER_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_ANALYSES_UNSAFEBUFFERUSAGE_UNSAFEBUFFERUSAGEBUILDER_H
diff --git a/clang/include/clang/Analysis/Scalable/Model/BuildNamespace.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/BuildNamespace.h
similarity index 95%
rename from clang/include/clang/Analysis/Scalable/Model/BuildNamespace.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/BuildNamespace.h
index 39307d976e986..16c6fd6fcb4ef 100644
--- a/clang/include/clang/Analysis/Scalable/Model/BuildNamespace.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/BuildNamespace.h
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_BUILDNAMESPACE_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_BUILDNAMESPACE_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_BUILDNAMESPACE_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_BUILDNAMESPACE_H
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
@@ -126,4 +126,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
 
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_BUILDNAMESPACE_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_BUILDNAMESPACE_H
diff --git a/clang/include/clang/Analysis/Scalable/Model/EntityId.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityId.h
similarity index 88%
rename from clang/include/clang/Analysis/Scalable/Model/EntityId.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityId.h
index 11940e7b40a8b..0da76e17c823e 100644
--- a/clang/include/clang/Analysis/Scalable/Model/EntityId.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityId.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITY_ID_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITY_ID_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYID_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYID_H
 
 #include "llvm/Support/raw_ostream.h"
 #include <cstddef>
@@ -51,4 +51,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const EntityId &Id);
 
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITY_ID_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYID_H
diff --git a/clang/include/clang/Analysis/Scalable/Model/EntityIdTable.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityIdTable.h
similarity index 79%
rename from clang/include/clang/Analysis/Scalable/Model/EntityIdTable.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityIdTable.h
index 6c5f27907adb4..d74b871df3e16 100644
--- a/clang/include/clang/Analysis/Scalable/Model/EntityIdTable.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityIdTable.h
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITY_ID_TABLE_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITY_ID_TABLE_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYIDTABLE_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYIDTABLE_H
 
-#include "clang/Analysis/Scalable/Model/EntityId.h"
-#include "clang/Analysis/Scalable/Model/EntityName.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/Model/EntityId.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/Model/EntityName.h"
 #include <functional>
 #include <map>
 
@@ -50,4 +50,4 @@ class EntityIdTable {
 
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITY_ID_TABLE_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYIDTABLE_H
diff --git a/clang/include/clang/Analysis/Scalable/Model/EntityLinkage.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityLinkage.h
similarity index 87%
rename from clang/include/clang/Analysis/Scalable/Model/EntityLinkage.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityLinkage.h
index 3e9374d6ddab3..cdae99ad0b6b2 100644
--- a/clang/include/clang/Analysis/Scalable/Model/EntityLinkage.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityLinkage.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITYLINKAGE_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITYLINKAGE_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYLINKAGE_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYLINKAGE_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
@@ -49,4 +49,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
 
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITYLINKAGE_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYLINKAGE_H
diff --git a/clang/include/clang/Analysis/Scalable/Model/EntityName.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityName.h
similarity index 87%
rename from clang/include/clang/Analysis/Scalable/Model/EntityName.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityName.h
index 05dc1e1205a18..853ac96209a86 100644
--- a/clang/include/clang/Analysis/Scalable/Model/EntityName.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/EntityName.h
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITYNAME_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITYNAME_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYNAME_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYNAME_H
 
-#include "clang/Analysis/Scalable/Model/BuildNamespace.h"
+#include "clang/ScalableStaticAnalysisFramework/Core/Model/BuildNamespace.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
@@ -59,4 +59,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const EntityName &EN);
 
 } // namespace clang::ssaf
 
-#endif // LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_ENTITYNAME_H
+#endif // LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_ENTITYNAME_H
diff --git a/clang/include/clang/Analysis/Scalable/Model/PrivateFieldNames.def b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/PrivateFieldNames.def
similarity index 95%
rename from clang/include/clang/Analysis/Scalable/Model/PrivateFieldNames.def
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/PrivateFieldNames.def
index 8ef57b9a1aa19..1ee2a809430f4 100644
--- a/clang/include/clang/Analysis/Scalable/Model/PrivateFieldNames.def
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/PrivateFieldNames.def
@@ -1,4 +1,4 @@
-//===-- PrivateFieldNames.def -----------------------------------*- C++ -*-===//
+//===- PrivateFieldNames.def ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/clang/include/clang/Analysis/Scalable/Model/SummaryName.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/SummaryName.h
similarity index 84%
rename from clang/include/clang/Analysis/Scalable/Model/SummaryName.h
rename to clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/SummaryName.h
index 3017ade86f95c..99b5308e61a4e 100644
--- a/clang/include/clang/Analysis/Scalable/Model/SummaryName.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Model/SummaryName.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_SUMMARYNAME_H
-#define LLVM_CLANG_ANALYSIS_SCALABLE_MODEL_SUMMARYNAME_H
+#ifndef LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_SUMMARYNAME_H
+#define LLVM_CLANG_SCALABLESTATICANALYSISFRAMEWORK_CORE_MODEL_SUMMARYNAME_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
@@ -38,4 +38,4 @@ class SummaryName {
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const SummaryName &SN);
 } // namespace clang::ssaf
 
-#endif // LLV...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/186156