diff options
| -rw-r--r-- | clang-tools-extra/modularize/CoverageChecker.cpp | 4 | ||||
| -rw-r--r-- | clang-tools-extra/modularize/ModularizeUtilities.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang-tools-extra/modularize/CoverageChecker.cpp b/clang-tools-extra/modularize/CoverageChecker.cpp index 204e2e44eab..3a9faa4f696 100644 --- a/clang-tools-extra/modularize/CoverageChecker.cpp +++ b/clang-tools-extra/modularize/CoverageChecker.cpp @@ -206,7 +206,7 @@ void CoverageChecker::collectModuleHeaders() { // FIXME: Doesn't collect files from umbrella header. bool CoverageChecker::collectModuleHeaders(const Module &Mod) { - if (const FileEntry *UmbrellaHeader = Mod.getUmbrellaHeader()) { + if (const FileEntry *UmbrellaHeader = Mod.getUmbrellaHeader().Entry) { // Collect umbrella header. ModuleMapHeadersSet.insert(ModularizeUtilities::getCanonicalPath( UmbrellaHeader->getName())); @@ -214,7 +214,7 @@ bool CoverageChecker::collectModuleHeaders(const Module &Mod) { if (!collectUmbrellaHeaderHeaders(UmbrellaHeader->getName())) return false; } - else if (const DirectoryEntry *UmbrellaDir = Mod.getUmbrellaDir()) { + else if (const DirectoryEntry *UmbrellaDir = Mod.getUmbrellaDir().Entry) { // Collect headers in umbrella directory. if (!collectUmbrellaHeaders(UmbrellaDir->getName())) return false; diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp index 1bbae3c84ab..62b6e911fbf 100644 --- a/clang-tools-extra/modularize/ModularizeUtilities.cpp +++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp @@ -278,14 +278,14 @@ bool ModularizeUtilities::collectModuleHeaders(const Module &Mod) { MI != MIEnd; ++MI) collectModuleHeaders(**MI); - if (const FileEntry *UmbrellaHeader = Mod.getUmbrellaHeader()) { + if (const FileEntry *UmbrellaHeader = Mod.getUmbrellaHeader().Entry) { std::string HeaderPath = getCanonicalPath(UmbrellaHeader->getName()); // Collect umbrella header. HeaderFileNames.push_back(HeaderPath); // FUTURE: When needed, umbrella header header collection goes here. } - else if (const DirectoryEntry *UmbrellaDir = Mod.getUmbrellaDir()) { + else if (const DirectoryEntry *UmbrellaDir = Mod.getUmbrellaDir().Entry) { // If there normal headers, assume these are umbrellas and skip collection. if (Mod.Headers->size() == 0) { // Collect headers in umbrella directory. |
