From 65cb738ff41995a06f18b6143d515af5e7653bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Benics?= Date: Tue, 10 Mar 2026 10:49:12 +0000 Subject: [PATCH] [clang][Index][NFC] Carve out USRGeneration from clangIndex (#185499) Previously, USRGeneration was implemented by clangIndex. However, that poses too broad library layering constraints on the ever growing set of users of a tiny component of it, USRGeneration. This PR splits that into a small library, called: clangUnifiedSymbolResolution Anyone needing USRGeneration could simply link against this without pulling in everything from clangIndex. --- Importantly, clangIndex linked against clangFrontend to define its FrontendAction, and use some ASTUnit APIs. Some users may want to use USRGeneration but NOT depend on clangFrontend. This new clangUnifiedSymbolResolution library would solve such circular dependencies. PS: There were quite a few cases where libraries could just link against clangUnifiedSymbolResolution without linking to clangIndex. I've simplified those cases in this PR, to keep link deps minimal. --- clang-tools-extra/clang-doc/CMakeLists.txt | 2 +- clang-tools-extra/clang-doc/Mapper.cpp | 2 +- clang-tools-extra/clang-doc/Serialize.cpp | 2 +- clang-tools-extra/clangd/AST.cpp | 2 +- clang-tools-extra/clangd/CMakeLists.txt | 1 + clang-tools-extra/clangd/ExpectedTypes.cpp | 2 +- clang-tools-extra/clangd/XRefs.cpp | 2 +- .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 2 +- .../USRGeneration.h | 6 +++--- clang/lib/Analysis/Scalable/ASTEntityMapping.cpp | 2 +- clang/lib/Analysis/Scalable/CMakeLists.txt | 2 +- clang/lib/CMakeLists.txt | 1 + clang/lib/CrossTU/CMakeLists.txt | 2 +- clang/lib/CrossTU/CrossTranslationUnit.cpp | 2 +- clang/lib/ExtractAPI/CMakeLists.txt | 2 +- clang/lib/ExtractAPI/DeclarationFragments.cpp | 2 +- clang/lib/ExtractAPI/ExtractAPIConsumer.cpp | 2 +- .../ExtractAPI/TypedefUnderlyingTypeResolver.cpp | 2 +- clang/lib/Index/CMakeLists.txt | 2 +- clang/lib/Index/CommentToXML.cpp | 2 +- clang/lib/StaticAnalyzer/Core/CMakeLists.txt | 2 +- clang/lib/StaticAnalyzer/Core/EntryPointStats.cpp | 2 +- clang/lib/Tooling/Refactoring/CMakeLists.txt | 2 +- .../lib/Tooling/Refactoring/Rename/USRFinder.cpp | 2 +- clang/lib/UnifiedSymbolResolution/CMakeLists.txt | 15 +++++++++++++++ .../USRGeneration.cpp | 2 +- clang/tools/c-index-test/CMakeLists.txt | 1 + clang/tools/c-index-test/core_main.cpp | 2 +- clang/tools/libclang/CIndexUSRs.cpp | 2 +- clang/tools/libclang/CMakeLists.txt | 1 + clang/tools/libclang/CXExtractAPI.cpp | 2 +- clang/unittests/Analysis/Scalable/CMakeLists.txt | 1 + 32 files changed, 48 insertions(+), 28 deletions(-) rename clang/include/clang/{Index => UnifiedSymbolResolution}/USRGeneration.h (95%) create mode 100644 clang/lib/UnifiedSymbolResolution/CMakeLists.txt rename clang/lib/{Index => UnifiedSymbolResolution}/USRGeneration.cpp (99%) diff --git a/clang-tools-extra/clang-doc/CMakeLists.txt b/clang-tools-extra/clang-doc/CMakeLists.txt index 5f248feeac63..22e2c8159e9f 100644 --- a/clang-tools-extra/clang-doc/CMakeLists.txt +++ b/clang-tools-extra/clang-doc/CMakeLists.txt @@ -32,10 +32,10 @@ clang_target_link_libraries(clangDoc clangASTMatchers clangBasic clangFrontend - clangIndex clangLex clangTooling clangToolingCore + clangUnifiedSymbolResolution ) target_link_libraries(clangDoc diff --git a/clang-tools-extra/clang-doc/Mapper.cpp b/clang-tools-extra/clang-doc/Mapper.cpp index bedf4f766c8b..583a0fe43b40 100644 --- a/clang-tools-extra/clang-doc/Mapper.cpp +++ b/clang-tools-extra/clang-doc/Mapper.cpp @@ -9,7 +9,7 @@ #include "Mapper.h" #include "Serialize.h" #include "clang/AST/Comment.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/Mutex.h" diff --git a/clang-tools-extra/clang-doc/Serialize.cpp b/clang-tools-extra/clang-doc/Serialize.cpp index f6b3c088425f..7b09c1ea29b5 100644 --- a/clang-tools-extra/clang-doc/Serialize.cpp +++ b/clang-tools-extra/clang-doc/Serialize.cpp @@ -15,8 +15,8 @@ #include "clang/AST/DeclFriend.h" #include "clang/AST/ExprConcepts.h" #include "clang/AST/Mangle.h" -#include "clang/Index/USRGeneration.h" #include "clang/Lex/Lexer.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/SHA1.h" diff --git a/clang-tools-extra/clangd/AST.cpp b/clang-tools-extra/clangd/AST.cpp index 84e405f30f2e..2ebc9b49cac5 100644 --- a/clang-tools-extra/clangd/AST.cpp +++ b/clang-tools-extra/clangd/AST.cpp @@ -27,8 +27,8 @@ #include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/Specifiers.h" -#include "clang/Index/USRGeneration.h" #include "clang/Sema/HeuristicResolver.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt index d7ec853af862..4d8649dbdcb0 100644 --- a/clang-tools-extra/clangd/CMakeLists.txt +++ b/clang-tools-extra/clangd/CMakeLists.txt @@ -177,6 +177,7 @@ clang_target_link_libraries(clangDaemon clangToolingInclusions clangToolingInclusionsStdlib clangToolingSyntax + clangUnifiedSymbolResolution ) target_link_libraries(clangDaemon diff --git a/clang-tools-extra/clangd/ExpectedTypes.cpp b/clang-tools-extra/clangd/ExpectedTypes.cpp index eaa87096d0d0..73e8b3e061c2 100644 --- a/clang-tools-extra/clangd/ExpectedTypes.cpp +++ b/clang-tools-extra/clangd/ExpectedTypes.cpp @@ -10,8 +10,8 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/DeclTemplate.h" #include "clang/AST/Type.h" -#include "clang/Index/USRGeneration.h" #include "clang/Sema/CodeCompleteConsumer.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include namespace clang { diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index c0ef0131c238..4b685b7bf793 100644 --- a/clang-tools-extra/clangd/XRefs.cpp +++ b/clang-tools-extra/clangd/XRefs.cpp @@ -49,10 +49,10 @@ #include "clang/Index/IndexSymbol.h" #include "clang/Index/IndexingAction.h" #include "clang/Index/IndexingOptions.h" -#include "clang/Index/USRGeneration.h" #include "clang/Lex/Lexer.h" #include "clang/Sema/HeuristicResolver.h" #include "clang/Tooling/Syntax/Tokens.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseSet.h" diff --git a/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h b/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h index 9ea664f57f82..67d54c9ebb81 100644 --- a/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h +++ b/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h @@ -28,7 +28,7 @@ #include "clang/ExtractAPI/API.h" #include "clang/ExtractAPI/DeclarationFragments.h" #include "clang/ExtractAPI/TypedefUnderlyingTypeResolver.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Casting.h" diff --git a/clang/include/clang/Index/USRGeneration.h b/clang/include/clang/UnifiedSymbolResolution/USRGeneration.h similarity index 95% rename from clang/include/clang/Index/USRGeneration.h rename to clang/include/clang/UnifiedSymbolResolution/USRGeneration.h index 66fede360389..d5bb5a704bfe 100644 --- a/clang/include/clang/Index/USRGeneration.h +++ b/clang/include/clang/UnifiedSymbolResolution/USRGeneration.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_INDEX_USRGENERATION_H -#define LLVM_CLANG_INDEX_USRGENERATION_H +#ifndef LLVM_CLANG_UNIFIEDSYMBOLRESOLUTION_USRGENERATION_H +#define LLVM_CLANG_UNIFIEDSYMBOLRESOLUTION_USRGENERATION_H #include "clang/Basic/LLVM.h" #include "llvm/ADT/StringRef.h" @@ -101,4 +101,4 @@ bool generateUSRFragmentForModuleName(StringRef ModName, raw_ostream &OS); } // namespace index } // namespace clang -#endif // LLVM_CLANG_INDEX_USRGENERATION_H +#endif // LLVM_CLANG_UNIFIEDSYMBOLRESOLUTION_USRGENERATION_H diff --git a/clang/lib/Analysis/Scalable/ASTEntityMapping.cpp b/clang/lib/Analysis/Scalable/ASTEntityMapping.cpp index 0a25e75e0163..dc7f68f82aa8 100644 --- a/clang/lib/Analysis/Scalable/ASTEntityMapping.cpp +++ b/clang/lib/Analysis/Scalable/ASTEntityMapping.cpp @@ -13,7 +13,7 @@ #include "clang/Analysis/Scalable/ASTEntityMapping.h" #include "clang/AST/Decl.h" #include "clang/Analysis/Scalable/Model/BuildNamespace.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/SmallString.h" namespace clang::ssaf { diff --git a/clang/lib/Analysis/Scalable/CMakeLists.txt b/clang/lib/Analysis/Scalable/CMakeLists.txt index 52f56fa6261e..4593fbcd515b 100644 --- a/clang/lib/Analysis/Scalable/CMakeLists.txt +++ b/clang/lib/Analysis/Scalable/CMakeLists.txt @@ -26,9 +26,9 @@ add_clang_library(clangAnalysisScalable clangAST clangASTMatchers clangBasic - clangIndex clangLex clangFrontend + clangUnifiedSymbolResolution DEPENDS ) diff --git a/clang/lib/CMakeLists.txt b/clang/lib/CMakeLists.txt index 2fc69e4e4fa6..8ffde5fd7beb 100644 --- a/clang/lib/CMakeLists.txt +++ b/clang/lib/CMakeLists.txt @@ -30,6 +30,7 @@ if(CLANG_INCLUDE_TESTS) endif() add_subdirectory(Interpreter) add_subdirectory(Support) +add_subdirectory(UnifiedSymbolResolution) if(CLANG_ENABLE_CIR) add_subdirectory(CIR) diff --git a/clang/lib/CrossTU/CMakeLists.txt b/clang/lib/CrossTU/CMakeLists.txt index eef7a892701f..ba55f99905a5 100644 --- a/clang/lib/CrossTU/CMakeLists.txt +++ b/clang/lib/CrossTU/CMakeLists.txt @@ -11,5 +11,5 @@ add_clang_library(clangCrossTU clangBasic clangDriver clangFrontend - clangIndex + clangUnifiedSymbolResolution ) diff --git a/clang/lib/CrossTU/CrossTranslationUnit.cpp b/clang/lib/CrossTU/CrossTranslationUnit.cpp index b0563b39e99e..b0b3bf5e2ae1 100644 --- a/clang/lib/CrossTU/CrossTranslationUnit.cpp +++ b/clang/lib/CrossTU/CrossTranslationUnit.cpp @@ -20,7 +20,7 @@ #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/Statistic.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/ErrorHandling.h" diff --git a/clang/lib/ExtractAPI/CMakeLists.txt b/clang/lib/ExtractAPI/CMakeLists.txt index f508ffc862cb..fbf2917e794d 100644 --- a/clang/lib/ExtractAPI/CMakeLists.txt +++ b/clang/lib/ExtractAPI/CMakeLists.txt @@ -15,7 +15,7 @@ add_clang_library(clangExtractAPI clangAST clangBasic clangFrontend - clangIndex clangInstallAPI clangLex + clangUnifiedSymbolResolution ) diff --git a/clang/lib/ExtractAPI/DeclarationFragments.cpp b/clang/lib/ExtractAPI/DeclarationFragments.cpp index 7f2778713ead..6c8d5df5c3bb 100644 --- a/clang/lib/ExtractAPI/DeclarationFragments.cpp +++ b/clang/lib/ExtractAPI/DeclarationFragments.cpp @@ -20,7 +20,7 @@ #include "clang/AST/Type.h" #include "clang/AST/TypeLoc.h" #include "clang/ExtractAPI/TypedefUnderlyingTypeResolver.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" diff --git a/clang/lib/ExtractAPI/ExtractAPIConsumer.cpp b/clang/lib/ExtractAPI/ExtractAPIConsumer.cpp index aac778d8bcc2..52027508c54c 100644 --- a/clang/lib/ExtractAPI/ExtractAPIConsumer.cpp +++ b/clang/lib/ExtractAPI/ExtractAPIConsumer.cpp @@ -30,12 +30,12 @@ #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendOptions.h" #include "clang/Frontend/MultiplexConsumer.h" -#include "clang/Index/USRGeneration.h" #include "clang/InstallAPI/HeaderFile.h" #include "clang/Lex/MacroInfo.h" #include "clang/Lex/PPCallbacks.h" #include "clang/Lex/Preprocessor.h" #include "clang/Lex/PreprocessorOptions.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" diff --git a/clang/lib/ExtractAPI/TypedefUnderlyingTypeResolver.cpp b/clang/lib/ExtractAPI/TypedefUnderlyingTypeResolver.cpp index 41e4e0cf1795..2fe97152c899 100644 --- a/clang/lib/ExtractAPI/TypedefUnderlyingTypeResolver.cpp +++ b/clang/lib/ExtractAPI/TypedefUnderlyingTypeResolver.cpp @@ -13,7 +13,7 @@ #include "clang/ExtractAPI/TypedefUnderlyingTypeResolver.h" #include "clang/Basic/Module.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" using namespace clang; using namespace extractapi; diff --git a/clang/lib/Index/CMakeLists.txt b/clang/lib/Index/CMakeLists.txt index f0d2b579c8df..2bdcf2ad9211 100644 --- a/clang/lib/Index/CMakeLists.txt +++ b/clang/lib/Index/CMakeLists.txt @@ -12,7 +12,6 @@ add_clang_library(clangIndex IndexingContext.cpp IndexSymbol.cpp IndexTypeSourceInfo.cpp - USRGeneration.cpp ADDITIONAL_HEADERS IndexingContext.h @@ -26,6 +25,7 @@ add_clang_library(clangIndex clangSema clangSerialization clangToolingCore + clangUnifiedSymbolResolution DEPENDS omp_gen diff --git a/clang/lib/Index/CommentToXML.cpp b/clang/lib/Index/CommentToXML.cpp index f396760126fc..a31176f68d0d 100644 --- a/clang/lib/Index/CommentToXML.cpp +++ b/clang/lib/Index/CommentToXML.cpp @@ -14,7 +14,7 @@ #include "clang/Basic/IdentifierTable.h" #include "clang/Basic/SourceManager.h" #include "clang/Format/Format.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/TinyPtrVector.h" #include "llvm/Support/raw_ostream.h" diff --git a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt index b8095a5427b5..a210f22b055b 100644 --- a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt +++ b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt @@ -61,10 +61,10 @@ add_clang_library(clangStaticAnalyzerCore clangBasic clangCrossTU clangFrontend - clangIndex clangLex clangRewrite clangToolingCore + clangUnifiedSymbolResolution DEPENDS omp_gen diff --git a/clang/lib/StaticAnalyzer/Core/EntryPointStats.cpp b/clang/lib/StaticAnalyzer/Core/EntryPointStats.cpp index c207a7b97917..7c2f71dc7b01 100644 --- a/clang/lib/StaticAnalyzer/Core/EntryPointStats.cpp +++ b/clang/lib/StaticAnalyzer/Core/EntryPointStats.cpp @@ -9,7 +9,7 @@ #include "clang/StaticAnalyzer/Core/PathSensitive/EntryPointStats.h" #include "clang/AST/DeclBase.h" #include "clang/Analysis/AnalysisDeclContext.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" diff --git a/clang/lib/Tooling/Refactoring/CMakeLists.txt b/clang/lib/Tooling/Refactoring/CMakeLists.txt index d3077be8810a..e311ba9ae17a 100644 --- a/clang/lib/Tooling/Refactoring/CMakeLists.txt +++ b/clang/lib/Tooling/Refactoring/CMakeLists.txt @@ -19,10 +19,10 @@ add_clang_library(clangToolingRefactoring clangASTMatchers clangBasic clangFormat - clangIndex clangLex clangRewrite clangToolingCore + clangUnifiedSymbolResolution DEPENDS omp_gen diff --git a/clang/lib/Tooling/Refactoring/Rename/USRFinder.cpp b/clang/lib/Tooling/Refactoring/Rename/USRFinder.cpp index 91d5cafda4f7..66902614488a 100644 --- a/clang/lib/Tooling/Refactoring/Rename/USRFinder.cpp +++ b/clang/lib/Tooling/Refactoring/Rename/USRFinder.cpp @@ -15,9 +15,9 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Basic/SourceManager.h" -#include "clang/Index/USRGeneration.h" #include "clang/Lex/Lexer.h" #include "clang/Tooling/Refactoring/RecursiveSymbolVisitor.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" using namespace llvm; diff --git a/clang/lib/UnifiedSymbolResolution/CMakeLists.txt b/clang/lib/UnifiedSymbolResolution/CMakeLists.txt new file mode 100644 index 000000000000..9af565e95fff --- /dev/null +++ b/clang/lib/UnifiedSymbolResolution/CMakeLists.txt @@ -0,0 +1,15 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + +add_clang_library(clangUnifiedSymbolResolution + USRGeneration.cpp + + DEPENDS + omp_gen + + LINK_LIBS + clangAST + clangBasic + clangLex + ) diff --git a/clang/lib/Index/USRGeneration.cpp b/clang/lib/UnifiedSymbolResolution/USRGeneration.cpp similarity index 99% rename from clang/lib/Index/USRGeneration.cpp rename to clang/lib/UnifiedSymbolResolution/USRGeneration.cpp index 1831cc9ca864..c4788dd6917f 100644 --- a/clang/lib/Index/USRGeneration.cpp +++ b/clang/lib/UnifiedSymbolResolution/USRGeneration.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Attr.h" #include "clang/AST/DeclCXX.h" diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt index 41e80e66ffa7..56b4d1fe2069 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt @@ -31,6 +31,7 @@ else() clangFrontend clangIndex clangSerialization + clangUnifiedSymbolResolution ) endif() diff --git a/clang/tools/c-index-test/core_main.cpp b/clang/tools/c-index-test/core_main.cpp index 923609276eee..28a41ba7491f 100644 --- a/clang/tools/c-index-test/core_main.cpp +++ b/clang/tools/c-index-test/core_main.cpp @@ -16,10 +16,10 @@ #include "clang/Frontend/Utils.h" #include "clang/Index/IndexDataConsumer.h" #include "clang/Index/IndexingAction.h" -#include "clang/Index/USRGeneration.h" #include "clang/Lex/Preprocessor.h" #include "clang/Serialization/ASTReader.h" #include "clang/Serialization/ObjectFilePCHContainerReader.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/PrettyStackTrace.h" diff --git a/clang/tools/libclang/CIndexUSRs.cpp b/clang/tools/libclang/CIndexUSRs.cpp index be7c670cca01..893be4c4e204 100644 --- a/clang/tools/libclang/CIndexUSRs.cpp +++ b/clang/tools/libclang/CIndexUSRs.cpp @@ -15,8 +15,8 @@ #include "CXString.h" #include "CXTranslationUnit.h" #include "clang/Frontend/ASTUnit.h" -#include "clang/Index/USRGeneration.h" #include "clang/Lex/PreprocessingRecord.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/raw_ostream.h" diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index b0105f5a5f79..df2b0e24e0a2 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -70,6 +70,7 @@ set(LIBS clangSema clangSerialization clangTooling + clangUnifiedSymbolResolution ) if (HAVE_LIBDL) diff --git a/clang/tools/libclang/CXExtractAPI.cpp b/clang/tools/libclang/CXExtractAPI.cpp index c35558e66fcb..9b749a31f386 100644 --- a/clang/tools/libclang/CXExtractAPI.cpp +++ b/clang/tools/libclang/CXExtractAPI.cpp @@ -26,7 +26,7 @@ #include "clang/ExtractAPI/Serialization/SymbolGraphSerializer.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/FrontendOptions.h" -#include "clang/Index/USRGeneration.h" +#include "clang/UnifiedSymbolResolution/USRGeneration.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/CBindingWrapping.h" #include "llvm/Support/Casting.h" diff --git a/clang/unittests/Analysis/Scalable/CMakeLists.txt b/clang/unittests/Analysis/Scalable/CMakeLists.txt index f021263312d2..54f9de71884d 100644 --- a/clang/unittests/Analysis/Scalable/CMakeLists.txt +++ b/clang/unittests/Analysis/Scalable/CMakeLists.txt @@ -30,6 +30,7 @@ add_distinct_clang_unittest(ClangScalableAnalysisTests clangFrontend clangSerialization clangTooling + clangUnifiedSymbolResolution LINK_LIBS clangTesting LLVMTestingSupport