Skip to content

[ClangImporter] Fix Build Break Due to clang API changes #84925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2025
Merged

[ClangImporter] Fix Build Break Due to clang API changes #84925

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3ec0a2
WIP
jansvoboda11 Oct 15, 2025
2668347
Fix build failure due to clang changes.
qiongsiwu Oct 15, 2025
3208bd7
Merge branch 'main' into jan_svoboda/main-sandbox-cherry-pick
qiongsiwu Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ bool ClangImporter::canReadPCH(StringRef PCHFilename) {
// Note: Reusing the file manager is safe; this is a component that's already
// reused when building PCM files for the module cache.
CI.setVirtualFileSystem(Impl.Instance->getVirtualFileSystemPtr());
CI.setFileManager(&Impl.Instance->getFileManager());
CI.setFileManager(Impl.Instance->getFileManagerPtr());
CI.createSourceManager();
auto &clangSrcMgr = CI.getSourceManager();
auto FID = clangSrcMgr.createFileID(
Expand Down Expand Up @@ -1409,7 +1409,6 @@ std::unique_ptr<ClangImporter> ClangImporter::create(
auto actualDiagClient = std::make_unique<ClangDiagnosticConsumer>(
importer->Impl, instance.getDiagnosticOpts(),
importerOpts.DumpClangDiagnostics);

instance.createVirtualFileSystem(std::move(VFS), actualDiagClient.get());
instance.createFileManager();
instance.createDiagnostics(actualDiagClient.release());
Expand Down Expand Up @@ -1927,7 +1926,7 @@ std::string ClangImporter::getBridgingHeaderContents(
&Impl.Instance->getModuleCache());
rewriteInstance.setVirtualFileSystem(
Impl.Instance->getVirtualFileSystemPtr());
rewriteInstance.setFileManager(&Impl.Instance->getFileManager());
rewriteInstance.setFileManager(Impl.Instance->getFileManagerPtr());
rewriteInstance.createDiagnostics(new clang::IgnoringDiagConsumer);
rewriteInstance.createSourceManager();
rewriteInstance.setTarget(&Impl.Instance->getTarget());
Expand Down Expand Up @@ -1977,8 +1976,7 @@ std::string ClangImporter::getBridgingHeaderContents(
return "";
}

if (auto fileInfo =
rewriteInstance.getFileManager().getOptionalFileRef(headerPath)) {
if (auto fileInfo = rewriteInstance.getFileManager().getOptionalFileRef(headerPath)) {
fileSize = fileInfo->getSize();
fileModTime = fileInfo->getModificationTime();
}
Expand Down Expand Up @@ -2032,7 +2030,7 @@ ClangImporter::cloneCompilerInstanceForPrecompiling() {
&Impl.Instance->getModuleCache());
clonedInstance->setVirtualFileSystem(
Impl.Instance->getVirtualFileSystemPtr());
clonedInstance->setFileManager(&Impl.Instance->getFileManager());
clonedInstance->setFileManager(Impl.Instance->getFileManagerPtr());
clonedInstance->createDiagnostics(&Impl.Instance->getDiagnosticClient(),
/*ShouldOwnClient=*/false);
clonedInstance->createSourceManager();
Expand Down