diff options
| author | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2018-01-04 07:31:24 +0000 |
|---|---|---|
| committer | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2018-01-04 07:31:24 +0000 |
| commit | fec26b0bbba9f7c1704f021c1d830bb012578674 (patch) | |
| tree | da8a037faa566951a59fa9e6f2ff9a0397d329fd /clang/lib/Basic/Module.cpp | |
| parent | b8f2978bec86d1f4d04f4e1eebbfa9e7bada0c9a (diff) | |
| download | bcm5719-llvm-fec26b0bbba9f7c1704f021c1d830bb012578674.tar.gz bcm5719-llvm-fec26b0bbba9f7c1704f021c1d830bb012578674.zip | |
Revert "[Modules] Allow modules specified by -fmodule-map-file to shadow implicitly found ones"
This reverts r321781 until I fix the leaks pointed out by bots:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/12146
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/3741
llvm-svn: 321786
Diffstat (limited to 'clang/lib/Basic/Module.cpp')
| -rw-r--r-- | clang/lib/Basic/Module.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index 692e138f6c1..7124184865c 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -95,16 +95,11 @@ static bool hasFeature(StringRef Feature, const LangOptions &LangOpts, bool Module::isAvailable(const LangOptions &LangOpts, const TargetInfo &Target, Requirement &Req, - UnresolvedHeaderDirective &MissingHeader, - Module *&ShadowingModule) const { + UnresolvedHeaderDirective &MissingHeader) const { if (IsAvailable) return true; for (const Module *Current = this; Current; Current = Current->Parent) { - if (Current->ShadowingModule) { - ShadowingModule = Current->ShadowingModule; - return false; - } for (unsigned I = 0, N = Current->Requirements.size(); I != N; ++I) { if (hasFeature(Current->Requirements[I].first, LangOpts, Target) != Current->Requirements[I].second) { |
