diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-10 20:30:23 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-10 20:30:23 +0000 |
commit | fc970014c204eae2421c814bf240999b105b01fc (patch) | |
tree | 0a3f93ef56fde5856f3d6359ffd5bfc115553fec /include/clang/Sema/Lookup.h | |
parent | d7421384ecab5271594595cf3ebda3580a6f366a (diff) |
[modules] Track all default template arguments for a given parameter across
modules, and allow use of a default template argument if any of the parameters
providing it is visible.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239485 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Sema/Lookup.h')
-rw-r--r-- | include/clang/Sema/Lookup.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/clang/Sema/Lookup.h b/include/clang/Sema/Lookup.h index 97192b53fa..5bfee8b0d0 100644 --- a/include/clang/Sema/Lookup.h +++ b/include/clang/Sema/Lookup.h @@ -302,14 +302,10 @@ public: if (!D->isInIdentifierNamespace(IDNS)) return nullptr; - if (isVisible(getSema(), D)) + if (isHiddenDeclarationVisible() || isVisible(getSema(), D)) return D; - if (auto *Visible = getAcceptableDeclSlow(D)) - return Visible; - - // Even if hidden declarations are visible, prefer a visible declaration. - return isHiddenDeclarationVisible() ? D : nullptr; + return getAcceptableDeclSlow(D); } private: |