diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2021-02-23 08:38:47 -0800 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2021-02-23 09:57:28 -0800 |
| commit | 64d8c7818db2bd428d4e2a9f27661ee49225477f (patch) | |
| tree | 66a51cf01beb70ba870480027291a9ec7bda51f9 /clang/lib/Basic/Module.cpp | |
| parent | eb165090bb063cb6b73433c30adeed6fef995108 (diff) | |
| download | llvm-64d8c7818db2bd428d4e2a9f27661ee49225477f.zip llvm-64d8c7818db2bd428d4e2a9f27661ee49225477f.tar.gz llvm-64d8c7818db2bd428d4e2a9f27661ee49225477f.tar.bz2 | |
Revert "Module: Use FileEntryRef and DirectoryEntryRef in Umbrella, Header, and DirectoryName, NFC"
This (mostly) reverts 32c501dd88b62787d3a5ffda7aabcf4650dbe3cd. Hit a
case where this causes a behaviour change, perhaps the same root cause
that triggered the revert of a40db5502b2515a6f2f1676b5d7a655ae0f41179 in
7799ef7121aa7d59f4bd95cdf70035de724ead6f.
(The API changes in DirectoryEntry.h have NOT been reverted as a number
of subsequent commits depend on those.)
https://reviews.llvm.org/D90497#2582166
Diffstat (limited to 'clang/lib/Basic/Module.cpp')
| -rw-r--r-- | clang/lib/Basic/Module.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index 2dd53b0..8730a5d 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -247,10 +247,7 @@ Module::DirectoryName Module::getUmbrellaDir() const { if (Header U = getUmbrellaHeader()) return {"", U.Entry->getDir()}; - if (auto *ME = Umbrella.dyn_cast<const DirectoryEntryRef::MapEntry *>()) - return {UmbrellaAsWritten, DirectoryEntryRef(*ME)}; - - return {"", None}; + return {UmbrellaAsWritten, Umbrella.dyn_cast<const DirectoryEntry *>()}; } void Module::addTopHeader(const FileEntry *File) { |