diff options
author | Nick Lewycky <nicholas@mxc.ca> | 2012-04-03 20:26:45 +0000 |
---|---|---|
committer | Nick Lewycky <nicholas@mxc.ca> | 2012-04-03 20:26:45 +0000 |
commit | 893a6eaf52930701950b7fc01a2478bb86899b77 (patch) | |
tree | 0e0723444897a303096b74bdc3af52eee8c33e26 /lib/Sema/SemaLookup.cpp | |
parent | 6d858d96ea294baecdf3e7ad3f3c5395c00dec8e (diff) |
Don't treat synthesized ivars as being in the base class for the purpose of
looking up visible decls.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153967 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaLookup.cpp')
-rw-r--r-- | lib/Sema/SemaLookup.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index adbfedc641..9fb248ed5b 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -38,14 +38,14 @@ #include "llvm/ADT/TinyPtrVector.h" #include "llvm/ADT/edit_distance.h" #include "llvm/Support/ErrorHandling.h" +#include <algorithm> +#include <iterator> #include <limits> #include <list> +#include <map> #include <set> -#include <vector> -#include <iterator> #include <utility> -#include <algorithm> -#include <map> +#include <vector> using namespace clang; using namespace sema; @@ -2984,7 +2984,7 @@ static void LookupVisibleDecls(DeclContext *Ctx, LookupResult &Result, if (IFace->getImplementation()) { ShadowContextRAII Shadow(Visited); LookupVisibleDecls(IFace->getImplementation(), Result, - QualifiedNameLookup, true, Consumer, Visited); + QualifiedNameLookup, InBaseClass, Consumer, Visited); } } else if (ObjCProtocolDecl *Protocol = dyn_cast<ObjCProtocolDecl>(Ctx)) { for (ObjCProtocolDecl::protocol_iterator I = Protocol->protocol_begin(), |