diff options
| author | John McCall <rjmccall@apple.com> | 2010-10-19 01:54:45 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-10-19 01:54:45 +0000 |
| commit | 613ef3d4c144f8c35224daf28a187426d2044aee (patch) | |
| tree | 836dc287bfb332866839b72228d4f05d4d4ca3ea /lib/Sema/SemaType.cpp | |
| parent | 9a34edb710917798aa30263374f624f13b594605 (diff) | |
Uncomputable contexts are always records but can exist.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116787 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaType.cpp')
| -rw-r--r-- | lib/Sema/SemaType.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index 2b13c213e5..e7219302c1 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -1408,11 +1408,15 @@ TypeSourceInfo *Sema::GetTypeForDeclarator(Declarator &D, Scope *S, // for a nonstatic member function, the function type to which a pointer // to member refers, or the top-level function type of a function typedef // declaration. - bool FreeFunction = - (D.getContext() != Declarator::MemberContext || - D.getDeclSpec().isFriendSpecified()) && - (!D.getCXXScopeSpec().isSet() || - !computeDeclContext(D.getCXXScopeSpec(), /*FIXME:*/true)->isRecord()); + bool FreeFunction; + if (!D.getCXXScopeSpec().isSet()) { + FreeFunction = (D.getContext() != Declarator::MemberContext || + D.getDeclSpec().isFriendSpecified()); + } else { + DeclContext *DC = computeDeclContext(D.getCXXScopeSpec()); + FreeFunction = (DC && !DC->isRecord()); + } + if (FnTy->getTypeQuals() != 0 && D.getDeclSpec().getStorageClassSpec() != DeclSpec::SCS_typedef && (FreeFunction || |