From d1f13c54f172875d9a14c46c09afb1f22d78cdf8 Mon Sep 17 00:00:00 2001
From: Kadir Cetinkaya <kadircet@google.com>
Date: Wed, 5 Oct 2022 09:52:20 +0200
Subject: [PATCH] [clang][Tooling] Move STL recognizer to its own library

As pointed out in https://reviews.llvm.org/D119130#3829816, this
introduces a clang AST dependency to the clangToolingInclusions, which is used
by clang-format.

Since rest of the inclusion tooling doesn't depend on clang ast, moving this
into a separate library.

Differential Revision: https://reviews.llvm.org/D135245
---
 clang-tools-extra/clangd/CMakeLists.txt                       | 1 +
 clang/lib/Tooling/Inclusions/CMakeLists.txt                   | 4 ++--
 clang/lib/Tooling/Inclusions/Stdlib/CMakeLists.txt            | 6 ++++++
 clang/lib/Tooling/Inclusions/{ => Stdlib}/StandardLibrary.cpp | 0
 clang/unittests/Tooling/CMakeLists.txt                        | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 clang/lib/Tooling/Inclusions/Stdlib/CMakeLists.txt
 rename clang/lib/Tooling/Inclusions/{ => Stdlib}/StandardLibrary.cpp (100%)

diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
index de8f087..56ff54f 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -160,6 +160,7 @@ clang_target_link_libraries(clangDaemon
   clangTooling
   clangToolingCore
   clangToolingInclusions
+  clangToolingInclusionsStdlib
   clangToolingSyntax
   )
 
diff --git a/clang/lib/Tooling/Inclusions/CMakeLists.txt b/clang/lib/Tooling/Inclusions/CMakeLists.txt
index fba003b..1954d16 100644
--- a/clang/lib/Tooling/Inclusions/CMakeLists.txt
+++ b/clang/lib/Tooling/Inclusions/CMakeLists.txt
@@ -3,12 +3,12 @@ set(LLVM_LINK_COMPONENTS support)
 add_clang_library(clangToolingInclusions
   HeaderIncludes.cpp
   IncludeStyle.cpp
-  StandardLibrary.cpp
 
   LINK_LIBS
-  clangAST
   clangBasic
   clangLex
   clangRewrite
   clangToolingCore
   )
+
+  add_subdirectory(Stdlib)
diff --git a/clang/lib/Tooling/Inclusions/Stdlib/CMakeLists.txt b/clang/lib/Tooling/Inclusions/Stdlib/CMakeLists.txt
new file mode 100644
index 0000000..0f52c35
--- /dev/null
+++ b/clang/lib/Tooling/Inclusions/Stdlib/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_clang_library(clangToolingInclusionsStdlib
+  StandardLibrary.cpp
+
+  LINK_LIBS
+  clangAST
+  )
diff --git a/clang/lib/Tooling/Inclusions/StandardLibrary.cpp b/clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp
similarity index 100%
rename from clang/lib/Tooling/Inclusions/StandardLibrary.cpp
rename to clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp
diff --git a/clang/unittests/Tooling/CMakeLists.txt b/clang/unittests/Tooling/CMakeLists.txt
index dfc1f59..424932e 100644
--- a/clang/unittests/Tooling/CMakeLists.txt
+++ b/clang/unittests/Tooling/CMakeLists.txt
@@ -81,6 +81,7 @@ clang_target_link_libraries(ToolingTests
   clangTooling
   clangToolingCore
   clangToolingInclusions
+  clangToolingInclusionsStdlib
   clangToolingRefactoring
   clangTransformer
   )
-- 
2.7.4