From 2537a3648334fc0a51a68f3ee443cba2db8074be Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 8 Dec 2011 17:01:29 +0000 Subject: Keep track of import dependencies between submodules within the module that's currently being built. This is important for supporting transitive dependencies ("export *" in the module map) completely. llvm-svn: 146156 --- clang/include/clang/Lex/DirectoryLookup.h | 4 ---- clang/include/clang/Lex/HeaderSearch.h | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'clang/include') diff --git a/clang/include/clang/Lex/DirectoryLookup.h b/clang/include/clang/Lex/DirectoryLookup.h index 47fb7d28e45..148f599cc3a 100644 --- a/clang/include/clang/Lex/DirectoryLookup.h +++ b/clang/include/clang/Lex/DirectoryLookup.h @@ -142,15 +142,12 @@ public: /// SearchPath at which the file was found. This only differs from the /// Filename for framework includes. /// - /// \param BuildingModule The name of the module we're currently building. - /// /// \param SuggestedModule If non-null, and the file found is semantically /// part of a known module, this will be set to the module that should /// be imported instead of preprocessing/parsing the file found. const FileEntry *LookupFile(StringRef Filename, HeaderSearch &HS, SmallVectorImpl *SearchPath, SmallVectorImpl *RelativePath, - StringRef BuildingModule, Module **SuggestedModule) const; private: @@ -158,7 +155,6 @@ private: StringRef Filename, HeaderSearch &HS, SmallVectorImpl *SearchPath, SmallVectorImpl *RelativePath, - StringRef BuildingModule, Module **SuggestedModule) const; }; diff --git a/clang/include/clang/Lex/HeaderSearch.h b/clang/include/clang/Lex/HeaderSearch.h index fba3606f440..02f8c021208 100644 --- a/clang/include/clang/Lex/HeaderSearch.h +++ b/clang/include/clang/Lex/HeaderSearch.h @@ -135,9 +135,6 @@ class HeaderSearch { /// \brief The path to the module cache. std::string ModuleCachePath; - /// \brief The name of the module we're building. - std::string BuildingModule; - /// FileInfo - This contains all of the preprocessor-specific data about files /// that are included. The vector is indexed by the FileEntry's UID. /// @@ -216,11 +213,9 @@ public: SystemDirIdx++; } - /// \brief Set the path to the module cache and the name of the module - /// we're building - void configureModules(StringRef CachePath, StringRef BuildingModule) { + /// \brief Set the path to the module cache. + void setModuleCachePath(StringRef CachePath) { ModuleCachePath = CachePath; - this->BuildingModule = BuildingModule; } /// \brief Retrieve the path to the module cache. -- cgit v1.2.3