diff options
-rw-r--r-- | lib/Sema/SemaLookup.cpp | 4 | ||||
-rw-r--r-- | test/SemaCXX/lookup-member.cpp | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index 9d65891a0f..acc5b354f8 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -918,6 +918,10 @@ bool Sema::CppLookupName(LookupResult &R, Scope *S) { // FIXME: This really, really shouldn't be happening. if (!S) return false; + // If we are looking for members, no need to look into global/namespace scope. + if (R.getLookupKind() == LookupMemberName) + return false; + // Collect UsingDirectiveDecls in all scopes, and recursively all // nominated namespaces by those using-directives. // diff --git a/test/SemaCXX/lookup-member.cpp b/test/SemaCXX/lookup-member.cpp new file mode 100644 index 0000000000..c75b185bcc --- /dev/null +++ b/test/SemaCXX/lookup-member.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s + +namespace A { + class String; +}; + +using A::String; +class String; + +// rdar://8603569 +union value { +char *String; +}; |