Author: Balázs Benics Date: 2026-03-10T10:49:12Z New Revision: 65cb738ff41995a06f18b6143d515af5e7653bfb
URL: https://github.com/llvm/llvm-project/commit/65cb738ff41995a06f18b6143d515af5e7653bfb DIFF: https://github.com/llvm/llvm-project/commit/65cb738ff41995a06f18b6143d515af5e7653bfb.diff LOG: [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. Added: clang/include/clang/UnifiedSymbolResolution/USRGeneration.h clang/lib/UnifiedSymbolResolution/CMakeLists.txt clang/lib/UnifiedSymbolResolution/USRGeneration.cpp Modified: clang-tools-extra/clang-doc/CMakeLists.txt clang-tools-extra/clang-doc/Mapper.cpp clang-tools-extra/clang-doc/Serialize.cpp clang-tools-extra/clangd/AST.cpp clang-tools-extra/clangd/CMakeLists.txt clang-tools-extra/clangd/ExpectedTypes.cpp clang-tools-extra/clangd/XRefs.cpp clang/include/clang/ExtractAPI/ExtractAPIVisitor.h clang/lib/Analysis/Scalable/ASTEntityMapping.cpp clang/lib/Analysis/Scalable/CMakeLists.txt clang/lib/CMakeLists.txt clang/lib/CrossTU/CMakeLists.txt clang/lib/CrossTU/CrossTranslationUnit.cpp clang/lib/ExtractAPI/CMakeLists.txt clang/lib/ExtractAPI/DeclarationFragments.cpp clang/lib/ExtractAPI/ExtractAPIConsumer.cpp clang/lib/ExtractAPI/TypedefUnderlyingTypeResolver.cpp clang/lib/Index/CMakeLists.txt clang/lib/Index/CommentToXML.cpp clang/lib/StaticAnalyzer/Core/CMakeLists.txt clang/lib/StaticAnalyzer/Core/EntryPointStats.cpp clang/lib/Tooling/Refactoring/CMakeLists.txt clang/lib/Tooling/Refactoring/Rename/USRFinder.cpp clang/tools/c-index-test/CMakeLists.txt clang/tools/c-index-test/core_main.cpp clang/tools/libclang/CIndexUSRs.cpp clang/tools/libclang/CMakeLists.txt clang/tools/libclang/CXExtractAPI.cpp clang/unittests/Analysis/Scalable/CMakeLists.txt Removed: clang/include/clang/Index/USRGeneration.h clang/lib/Index/USRGeneration.cpp ################################################################################ diff --git a/clang-tools-extra/clang-doc/CMakeLists.txt b/clang-tools-extra/clang-doc/CMakeLists.txt index 5f248feeac63d..22e2c8159e9f6 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 bedf4f766c8b0..583a0fe43b40c 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 f6b3c088425fc..7b09c1ea29b50 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 84e405f30f2e8..2ebc9b49cac55 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 d7ec853af862f..4d8649dbdcb09 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 eaa87096d0d0e..73e8b3e061c25 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 <optional> namespace clang { diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index c0ef0131c238f..4b685b7bf793e 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 9ea664f57f828..67d54c9ebb811 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 66fede3603899..d5bb5a704bfe1 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 0a25e75e01631..dc7f68f82aa81 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 52f56fa6261ed..4593fbcd515b5 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 2fc69e4e4fa6f..8ffde5fd7bebf 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 eef7a892701fb..ba55f99905a56 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 b0563b39e99ed..b0b3bf5e2ae1e 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 f508ffc862cb5..fbf2917e794d3 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 7f2778713eade..6c8d5df5c3bb0 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 aac778d8bcc2b..52027508c54ca 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 41e4e0cf1795f..2fe97152c8995 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 f0d2b579c8df6..2bdcf2ad92117 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 f396760126fcc..a31176f68d0d4 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 b8095a5427b51..a210f22b055b2 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 c207a7b97917a..7c2f71dc7b01e 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 d3077be8810aa..e311ba9ae17a6 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 91d5cafda4f7a..66902614488a7 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 0000000000000..9af565e95fff9 --- /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 1831cc9ca8643..c4788dd6917f2 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 41e80e66ffa7a..56b4d1fe20699 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 923609276eee8..28a41ba7491f6 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 be7c670cca011..893be4c4e204a 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 b0105f5a5f79f..df2b0e24e0a23 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 c35558e66fcb9..9b749a31f386a 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 f021263312d29..54f9de71884dd 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 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
