diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-06-13 19:31:46 +0000 | 
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-07-31 18:56:55 +0000 | 
| commit | af732203b8f7f006927528db5497f5cbc4c4742a (patch) | |
| tree | 596f112de3b76118552871dbb6114bb7e3e17f40 /contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp | |
| parent | 83dea422ac8d4a8323e64203c2eadaa813768717 (diff) | |
Diffstat (limited to 'contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp')
| -rw-r--r-- | contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp b/contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp index 1486adf70c3f..380eba4562b4 100644 --- a/contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp +++ b/contrib/llvm-project/clang/lib/Frontend/ChainedIncludesSource.cpp @@ -83,10 +83,10 @@ createASTReader(CompilerInstance &CI, StringRef pchFile,                  ASTDeserializationListener *deserialListener = nullptr) {    Preprocessor &PP = CI.getPreprocessor();    std::unique_ptr<ASTReader> Reader; -  Reader.reset(new ASTReader(PP, CI.getModuleCache(), &CI.getASTContext(), -                             CI.getPCHContainerReader(), -                             /*Extensions=*/{}, -                             /*isysroot=*/"", /*DisableValidation=*/true)); +  Reader.reset(new ASTReader( +      PP, CI.getModuleCache(), &CI.getASTContext(), CI.getPCHContainerReader(), +      /*Extensions=*/{}, +      /*isysroot=*/"", DisableValidationForModuleKind::PCH));    for (unsigned ti = 0; ti < bufNames.size(); ++ti) {      StringRef sr(bufNames[ti]);      Reader->addInMemoryBuffer(sr, std::move(MemBufs[ti])); @@ -129,7 +129,8 @@ IntrusiveRefCntPtr<ExternalSemaSource> clang::createChainedIncludesSource(      CInvok->getPreprocessorOpts().ChainedIncludes.clear();      CInvok->getPreprocessorOpts().ImplicitPCHInclude.clear(); -    CInvok->getPreprocessorOpts().DisablePCHValidation = true; +    CInvok->getPreprocessorOpts().DisablePCHOrModuleValidation = +        DisableValidationForModuleKind::PCH;      CInvok->getPreprocessorOpts().Includes.clear();      CInvok->getPreprocessorOpts().MacroIncludes.clear();      CInvok->getPreprocessorOpts().Macros.clear();  | 
