[clang] 5cb8d93 - Fix build error on bots after 9f151df17800e1668c32e5314a290ae94c8f2dd3

Duncan P. N. Exon Smith via cfe-commits cfe-commits at lists.llvm.org
Mon Nov 2 12:55:35 PST 2020


Author: Duncan P. N. Exon Smith
Date: 2020-11-02T15:55:13-05:00
New Revision: 5cb8d93205463f169ad4dd532829147fed2e38d0

URL: https://github.com/llvm/llvm-project/commit/5cb8d93205463f169ad4dd532829147fed2e38d0
DIFF: https://github.com/llvm/llvm-project/commit/5cb8d93205463f169ad4dd532829147fed2e38d0.diff

LOG: Fix build error on bots after 9f151df17800e1668c32e5314a290ae94c8f2dd3

Attempt to fix build error on bots not seen locally.

Added: 
    

Modified: 
    clang/lib/Serialization/ASTReader.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index c06dee3d74b2..fb397246fd8d 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -3921,7 +3921,7 @@ ASTReader::ReadModuleMapFileBlock(RecordData &Record, ModuleFile &F,
     // Don't emit module relocation error if we have -fno-validate-pch
     if (!PP.getPreprocessorOpts().DisablePCHValidation && !ModMap) {
       if ((ClientLoadCapabilities & ARR_OutOfDate) == 0) {
-        if (auto *ASTFE = M ? M->getASTFile() : nullptr) {
+        if (auto ASTFE = M ? M->getASTFile() : None) {
           // This module was defined by an imported (explicit) module.
           Diag(diag::err_module_file_conflict) << F.ModuleName << F.FileName
                                                << ASTFE->getName();


        


More information about the cfe-commits mailing list