From: Duncan P. N. Exon Smith <dexonsmith@apple.com>
Date: Mon, 2 Nov 2020 20:55:02 +0000 (-0500)
Subject: Fix build error on bots after 9f151df17800e1668c32e5314a290ae94c8f2dd3
X-Git-Tag: llvmorg-13-init~7352
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cb8d93205463f169ad4dd532829147fed2e38d0;p=platform%2Fupstream%2Fllvm.git

Fix build error on bots after 9f151df17800e1668c32e5314a290ae94c8f2dd3

Attempt to fix build error on bots not seen locally.
---

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index c06dee3..fb39724 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();