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 | 13668f2083baa01092b451bec85c77a92c032530 (patch) | |
| tree | 62d3e7a5919045921d8eb3b146b2b3a87d809a47 | |
| parent | 2a02fe1bb2046b59c3b2a820758b62ba4e146969 (diff) | |
| download | bcm5719-llvm-13668f2083baa01092b451bec85c77a92c032530.tar.gz bcm5719-llvm-13668f2083baa01092b451bec85c77a92c032530.zip | |
Don't treat synthesized ivars as being in the base class for the purpose of
looking up visible decls.
llvm-svn: 153967
| -rw-r--r-- | clang/lib/Sema/SemaLookup.cpp | 10 | ||||
| -rw-r--r-- | clang/test/Index/complete-synthesized.m | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index adbfedc6415..9fb248ed5bd 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/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(), diff --git a/clang/test/Index/complete-synthesized.m b/clang/test/Index/complete-synthesized.m index 81f1ba186f1..216481a5c1f 100644 --- a/clang/test/Index/complete-synthesized.m +++ b/clang/test/Index/complete-synthesized.m @@ -43,4 +43,4 @@ // CHECK: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35) // CHECK-NOT: prop2 // CHECK-NOT: prop3 -// CHECK: ObjCIvarDecl:{ResultType double}{TypedText _prop4} (37) +// CHECK: ObjCIvarDecl:{ResultType double}{TypedText _prop4} (35) |
