diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-10-10 23:44:35 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-10-10 23:44:35 +0000 |
| commit | b008012426d1b9b1ba401ad7bebf4d65bd469b92 (patch) | |
| tree | fbdec14ae8fa6dd1a5010771b976dd02bd60250c | |
| parent | b77d197a78b30030e34bc14c27d63afc757c7d3b (diff) | |
Don't crash in Sema::IsSimplyAccessible if the declaration is not a C++ class member. Fixes PR11108.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141600 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 2 | ||||
| -rw-r--r-- | test/Index/complete-qualified.cpp | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index d322ebd410..6cd9230326 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -1652,7 +1652,7 @@ void Sema::CheckLookupAccess(const LookupResult &R) { /// \param Class the class/context from which to start the search /// \return true if the Decl is accessible from the Class, false otherwise. bool Sema::IsSimplyAccessible(NamedDecl *Decl, CXXRecordDecl *Class) { - if (!Class) + if (!Class || !Decl->isCXXClassMember()) return true; QualType qType = Class->getTypeForDecl()->getCanonicalTypeInternal(); diff --git a/test/Index/complete-qualified.cpp b/test/Index/complete-qualified.cpp new file mode 100644 index 0000000000..20f5105a8c --- /dev/null +++ b/test/Index/complete-qualified.cpp @@ -0,0 +1,20 @@ +template <typename X, typename Y> +class C +{ +}; + +class Foo +{ +public: + C<Foo, class Bar> c; +}; + +void foo() +{ + Foo:: + +// RUN: c-index-test -code-completion-at=%s:14:8 %s -o - | FileCheck -check-prefix=CC1 %s +// CHECK-CC1: FieldDecl:{ResultType C<Foo, class Bar>}{TypedText c} (35) +// CHECK-CC1: ClassDecl:{TypedText Foo} (35) +// CHECK-CC1: CXXMethod:{ResultType Foo &}{TypedText operator=}{LeftParen (}{Placeholder const Foo &}{RightParen )} (35) +// CHECK-CC1: CXXDestructor:{ResultType void}{TypedText ~Foo}{LeftParen (}{RightParen )} (35) |