[clang-tools-extra] r237509 - Update to match clang r237508.

[Richard Smith]

Author: rsmith
Date: Fri May 15 22:10:31 2015
New Revision: 237509

URL: http://llvm.org/viewvc/llvm-project?rev=237509&view=rev
Log:
Update to match clang r237508.

Modified:
    clang-tools-extra/trunk/modularize/CoverageChecker.cpp
    clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp

Modified: clang-tools-extra/trunk/modularize/CoverageChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/CoverageChecker.cpp?rev=237509&r1=237508&r2=237509&view=diff
==============================================================================
--- clang-tools-extra/trunk/modularize/CoverageChecker.cpp (original)
+++ clang-tools-extra/trunk/modularize/CoverageChecker.cpp Fri May 15 22:10:31 2015
@@ -206,7 +206,7 @@ void CoverageChecker::collectModuleHeade
 // 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::collectModuleHeade
     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;

Modified: clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp?rev=237509&r1=237508&r2=237509&view=diff
==============================================================================
--- clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp (original)
+++ clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp Fri May 15 22:10:31 2015
@@ -278,14 +278,14 @@ bool ModularizeUtilities::collectModuleH
       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.