[clang] [clang][deps] Collect discovered module dependencies' Link Libraries (PR #93588)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff ccde823b1341503f4622b3e4d8e167cf937b5f2a 763e8e1ba75dd8122eba2ebcab77c45fc4dcb7c0 -- clang/test/ClangScanDeps/link-libraries.c clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp clang/test/ClangScanDeps/diagnostics.c clang/test/ClangScanDeps/header-search-pruning-transitive.c clang/test/ClangScanDeps/header-search-pruning.cpp clang/test/ClangScanDeps/modules-canononical-module-map-case.c clang/test/ClangScanDeps/modules-context-hash.c clang/test/ClangScanDeps/modules-dep-args.c clang/test/ClangScanDeps/modules-extern-submodule.c clang/test/ClangScanDeps/modules-file-path-isolation.c clang/test/ClangScanDeps/modules-full-by-mod-name.c clang/test/ClangScanDeps/modules-full.cpp clang/test/ClangScanDeps/modules-incomplete-umbrella.c clang/test/ClangScanDeps/modules-no-undeclared-includes.c clang/test/ClangScanDeps/modules-pch-common-submodule.c clang/test/ClangScanDeps/modules-pch-common-via-submodule.c clang/test/ClangScanDeps/modules-pch.c clang/test/ClangScanDeps/modules-symlink-dir-vfs.c clang/test/ClangScanDeps/modules-transitive.c clang/test/ClangScanDeps/removed-args.c clang/tools/clang-scan-deps/ClangScanDeps.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h b/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
index 5afb373b34..6c5ddef46e 100644
--- a/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
+++ b/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
@@ -10,8 +10,8 @@
 #define LLVM_CLANG_TOOLING_DEPENDENCYSCANNING_MODULEDEPCOLLECTOR_H
 
 #include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
 #include "clang/Basic/Module.h"
+#include "clang/Basic/SourceManager.h"
 #include "clang/Frontend/CompilerInvocation.h"
 #include "clang/Frontend/Utils.h"
 #include "clang/Lex/HeaderSearch.h"
diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp
index 28da27fcef..a8f6150dd3 100644
--- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp
+++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp
@@ -348,20 +348,20 @@ static llvm::json::Array toJSONSorted(std::vector<ModuleID> V) {
   return Ret;
 }
 
-static llvm::json::Array toJSONSorted(llvm::SmallVector<Module::LinkLibrary, 2> &LinkLibs) {
-  llvm::sort(LinkLibs, [](const Module::LinkLibrary& lhs,
-			  const Module::LinkLibrary& rhs) {
+static llvm::json::Array
+toJSONSorted(llvm::SmallVector<Module::LinkLibrary, 2> &LinkLibs) {
+  llvm::sort(LinkLibs, [](const Module::LinkLibrary &lhs,
+                          const Module::LinkLibrary &rhs) {
     return lhs.Library < rhs.Library;
   });
 
   llvm::json::Array Ret;
   for (const Module::LinkLibrary &LL : LinkLibs)
     Ret.push_back(llvm::json::Object(
-        {{"link-name", LL.Library }, {"isFramework", LL.IsFramework}}));
+        {{"link-name", LL.Library}, {"isFramework", LL.IsFramework}}));
   return Ret;
 }
 
-
 // Thread safe.
 class FullDeps {
 public:
@@ -453,15 +453,13 @@ public:
     Array OutModules;
     for (auto &&ModID : ModuleIDs) {
       auto &MD = Modules[ModID];
-      Object O{
-          {"name", MD.ID.ModuleName},
-          {"context-hash", MD.ID.ContextHash},
-          {"file-deps", toJSONSorted(MD.FileDeps)},
-          {"clang-module-deps", toJSONSorted(MD.ClangModuleDeps)},
-          {"clang-modulemap-file", MD.ClangModuleMapFile},
-          {"command-line", MD.getBuildArguments()},
-	  {"link-libraries", toJSONSorted(MD.LinkLibraries)}
-      };
+      Object O{{"name", MD.ID.ModuleName},
+               {"context-hash", MD.ID.ContextHash},
+               {"file-deps", toJSONSorted(MD.FileDeps)},
+               {"clang-module-deps", toJSONSorted(MD.ClangModuleDeps)},
+               {"clang-modulemap-file", MD.ClangModuleMapFile},
+               {"command-line", MD.getBuildArguments()},
+               {"link-libraries", toJSONSorted(MD.LinkLibraries)}};
       OutModules.push_back(std::move(O));
     }
 

``````````

</details>


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