From f9ba851c9b5db8ea30846215e737702a1cc2c194 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Wed, 8 May 2013 23:46:55 +0000 Subject: [PATCH] [PCH] Remove the ASTReaderListener::ReadHeaderFileInfo callback. This made sense in pre-module era, before merging of HeaderFileInfos was introduced. Final part of rdar://13840148. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181490 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Lex/HeaderSearch.h | 3 --- include/clang/Serialization/ASTReader.h | 8 +------- lib/Frontend/ASTUnit.cpp | 14 +++----------- lib/Lex/HeaderSearch.cpp | 7 ------- lib/Serialization/ASTReader.cpp | 11 +---------- 5 files changed, 5 insertions(+), 38 deletions(-) diff --git a/include/clang/Lex/HeaderSearch.h b/include/clang/Lex/HeaderSearch.h index 5c748a538f..446a381046 100644 --- a/include/clang/Lex/HeaderSearch.h +++ b/include/clang/Lex/HeaderSearch.h @@ -519,9 +519,6 @@ public: unsigned header_file_size() const { return FileInfo.size(); } - // Used by ASTReader. - void setHeaderFileInfoForUID(HeaderFileInfo HFI, unsigned UID); - /// \brief Return the HeaderFileInfo structure for the specified FileEntry. const HeaderFileInfo &getFileInfo(const FileEntry *FE) const { return const_cast(this)->getFileInfo(FE); diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h index 2c0102e341..bb59784dff 100644 --- a/include/clang/Serialization/ASTReader.h +++ b/include/clang/Serialization/ASTReader.h @@ -166,9 +166,6 @@ public: return false; } - /// \brief Receives a HeaderFileInfo entry. - virtual void ReadHeaderFileInfo(const HeaderFileInfo &HFI, unsigned ID) {} - /// \brief Receives __COUNTER__ value. virtual void ReadCounter(const serialization::ModuleFile &M, unsigned Value) {} @@ -190,11 +187,9 @@ class PCHValidator : public ASTReaderListener { Preprocessor &PP; ASTReader &Reader; - unsigned NumHeaderInfos; - public: PCHValidator(Preprocessor &PP, ASTReader &Reader) - : PP(PP), Reader(Reader), NumHeaderInfos(0) {} + : PP(PP), Reader(Reader) {} virtual bool ReadLanguageOptions(const LangOptions &LangOpts, bool Complain); @@ -203,7 +198,6 @@ public: virtual bool ReadPreprocessorOptions(const PreprocessorOptions &PPOpts, bool Complain, std::string &SuggestedPredefines); - virtual void ReadHeaderFileInfo(const HeaderFileInfo &HFI, unsigned ID); virtual void ReadCounter(const serialization::ModuleFile &M, unsigned Value); private: diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index 8bd5172454..f05d722546 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -509,23 +509,19 @@ class ASTInfoCollector : public ASTReaderListener { Preprocessor &PP; ASTContext &Context; LangOptions &LangOpt; - HeaderSearch &HSI; IntrusiveRefCntPtr &TargetOpts; IntrusiveRefCntPtr &Target; unsigned &Counter; - unsigned NumHeaderInfos; - bool InitializedLanguage; public: ASTInfoCollector(Preprocessor &PP, ASTContext &Context, LangOptions &LangOpt, - HeaderSearch &HSI, IntrusiveRefCntPtr &TargetOpts, IntrusiveRefCntPtr &Target, unsigned &Counter) - : PP(PP), Context(Context), LangOpt(LangOpt), HSI(HSI), + : PP(PP), Context(Context), LangOpt(LangOpt), TargetOpts(TargetOpts), Target(Target), - Counter(Counter), NumHeaderInfos(0), + Counter(Counter), InitializedLanguage(false) {} virtual bool ReadLanguageOptions(const LangOptions &LangOpts, @@ -554,10 +550,6 @@ public: return false; } - virtual void ReadHeaderFileInfo(const HeaderFileInfo &HFI, unsigned ID) { - HSI.setHeaderFileInfoForUID(HFI, NumHeaderInfos++); - } - virtual void ReadCounter(const serialization::ModuleFile &M, unsigned Value) { Counter = Value; } @@ -798,7 +790,7 @@ ASTUnit *ASTUnit::LoadFromASTFile(const std::string &Filename, ReaderCleanup(Reader.get()); Reader->setListener(new ASTInfoCollector(*AST->PP, Context, - AST->ASTFileLangOpts, HeaderInfo, + AST->ASTFileLangOpts, AST->TargetOpts, AST->Target, Counter)); diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp index 5e56e3d113..b8556dde0b 100644 --- a/lib/Lex/HeaderSearch.cpp +++ b/lib/Lex/HeaderSearch.cpp @@ -876,13 +876,6 @@ void HeaderSearch::MarkFileModuleHeader(const FileEntry *FE, HFI.isCompilingModuleHeader = isCompilingModuleHeader; } -void HeaderSearch::setHeaderFileInfoForUID(HeaderFileInfo HFI, unsigned UID) { - if (UID >= FileInfo.size()) - FileInfo.resize(UID+1); - HFI.Resolved = true; - FileInfo[UID] = HFI; -} - bool HeaderSearch::ShouldEnterIncludeFile(const FileEntry *File, bool isImport){ ++NumIncluded; // Count # of attempted #includes. diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 22caeb8656..4a1ad260e3 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -377,12 +377,6 @@ bool PCHValidator::ReadPreprocessorOptions(const PreprocessorOptions &PPOpts, PP.getLangOpts()); } -void PCHValidator::ReadHeaderFileInfo(const HeaderFileInfo &HFI, - unsigned ID) { - PP.getHeaderSearchInfo().setHeaderFileInfoForUID(HFI, ID); - ++NumHeaderInfos; -} - void PCHValidator::ReadCounter(const ModuleFile &M, unsigned Value) { PP.setCounterValue(Value); } @@ -4394,11 +4388,8 @@ namespace { HeaderFileInfo ASTReader::GetHeaderFileInfo(const FileEntry *FE) { HeaderFileInfoVisitor Visitor(FE); ModuleMgr.visit(&HeaderFileInfoVisitor::visit, &Visitor); - if (Optional HFI = Visitor.getHeaderFileInfo()) { - if (Listener) - Listener->ReadHeaderFileInfo(*HFI, FE->getUID()); + if (Optional HFI = Visitor.getHeaderFileInfo()) return *HFI; - } return HeaderFileInfo(); } -- 2.40.0