diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Lex/ModuleMap.h | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/ModuleDependencyCollector.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/clang/include/clang/Lex/ModuleMap.h b/clang/include/clang/Lex/ModuleMap.h index b8cfb8faa8d..313cfbe7668 100644 --- a/clang/include/clang/Lex/ModuleMap.h +++ b/clang/include/clang/Lex/ModuleMap.h @@ -54,7 +54,7 @@ public: /// \brief Called when a header is added during module map parsing. /// /// \param File The header file itself. - virtual void moduleMapAddHeader(const FileEntry &File) {} + virtual void moduleMapAddHeader(StringRef Filename) {} }; class ModuleMap { diff --git a/clang/lib/Frontend/ModuleDependencyCollector.cpp b/clang/lib/Frontend/ModuleDependencyCollector.cpp index 02d3c515ef0..4ef3b1ee2e9 100644 --- a/clang/lib/Frontend/ModuleDependencyCollector.cpp +++ b/clang/lib/Frontend/ModuleDependencyCollector.cpp @@ -44,8 +44,7 @@ struct ModuleDependencyMMCallbacks : public ModuleMapCallbacks { ModuleDependencyMMCallbacks(ModuleDependencyCollector &Collector) : Collector(Collector) {} - void moduleMapAddHeader(const FileEntry &File) override { - StringRef HeaderPath = File.getName(); + void moduleMapAddHeader(StringRef HeaderPath) override { if (llvm::sys::path::is_absolute(HeaderPath)) Collector.addFile(HeaderPath); } diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 467ae7ec518..39ded6f6134 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -809,7 +809,7 @@ void ModuleMap::addHeader(Module *Mod, Module::Header Header, // Notify callbacks that we just added a new header. for (const auto &Cb : Callbacks) - Cb->moduleMapAddHeader(*Header.Entry); + Cb->moduleMapAddHeader(Header.Entry->getName()); } void ModuleMap::excludeHeader(Module *Mod, Module::Header Header) { |
