averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

ClangImporter: Adjust to r355777, PCMCache => ModuleCache

Browse Source 
Upstream Clang renamed getPCMCache() to getModuleCache() in r355777,
stopped passing it the Preprocessor passing it directly to ASTReader
instead.  Adapt to those API changes.

rdar://problem/48545366
(cherry picked from commit 131cff72b2)
This commit is contained in:
Duncan P. N. Exon Smith
2019-03-06 07:41:12 -08:00
parent 2924be7ba0
commit 9eed34235b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ClangImporter/ClangImporter.cpp
View File

@@ -759,7 +759,6 @@ bool ClangImporter::canReadPCH(StringRef PCHFilename) {
*clangDiags, *clangDiags,
CI.getLangOpts(), CI.getLangOpts(),
clangSrcMgr, clangSrcMgr,
CI.getPCMCache(),
headerSearchInfo, headerSearchInfo,
(clang::ModuleLoader &)CI, (clang::ModuleLoader &)CI,
/*IILookup=*/nullptr, /*IILookup=*/nullptr,
@@ -772,7 +771,7 @@ bool ClangImporter::canReadPCH(StringRef PCHFilename) {
// Note: Reusing the PCHContainerReader or ModuleFileExtensions could be // Note: Reusing the PCHContainerReader or ModuleFileExtensions could be
// dangerous. // dangerous.
std::unique_ptr<clang::ASTReader> Reader(new clang::ASTReader( std::unique_ptr<clang::ASTReader> Reader(new clang::ASTReader(
PP, &ctx, CI.getPCHContainerReader(), PP, CI.getModuleCache(), &ctx, CI.getPCHContainerReader(),
CI.getFrontendOpts().ModuleFileExtensions, CI.getFrontendOpts().ModuleFileExtensions,
CI.getHeaderSearchOpts().Sysroot, CI.getHeaderSearchOpts().Sysroot,
/*DisableValidation*/ false, /*DisableValidation*/ false,