From 4bfd680597862e437fcba739dce58531d0b15d6e Mon Sep 17 00:00:00 2001 From: John McCall Date: Tue, 15 Feb 2011 22:51:53 +0000 Subject: [PATCH] Handle delayed access in local declarations. PR9229. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125609 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaAccess.cpp | 24 ++++++++++++++---------- test/CXX/class.access/p6.cpp | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index 3103255d20..4f9bf1c5ed 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -1286,16 +1286,20 @@ static Sema::AccessResult CheckAccess(Sema &S, SourceLocation Loc, return Sema::AR_accessible; } -void Sema::HandleDelayedAccessCheck(DelayedDiagnostic &DD, Decl *Ctx) { - // Pretend we did this from the context of the newly-parsed - // declaration. If that declaration itself forms a declaration context, - // include it in the effective context so that parameters and return types of - // befriended functions have that function's access priveledges. - DeclContext *DC = Ctx->getDeclContext(); - if (isa(Ctx)) - DC = cast(Ctx); - else if (FunctionTemplateDecl *FnTpl = dyn_cast(Ctx)) - DC = cast(FnTpl->getTemplatedDecl()); +void Sema::HandleDelayedAccessCheck(DelayedDiagnostic &DD, Decl *decl) { + // Access control for names used in the declarations of functions + // and function templates should normally be evaluated in the context + // of the declaration, just in case it's a friend of something. + // However, this does not apply to local extern declarations. + + DeclContext *DC = decl->getDeclContext(); + if (FunctionDecl *fn = dyn_cast(decl)) { + if (!DC->isFunctionOrMethod()) DC = fn; + } else if (FunctionTemplateDecl *fnt = dyn_cast(decl)) { + // Never a local declaration. + DC = fnt->getTemplatedDecl(); + } + EffectiveContext EC(DC); AccessTarget Target(DD.getAccessData()); diff --git a/test/CXX/class.access/p6.cpp b/test/CXX/class.access/p6.cpp index 1112699c8b..fe3304a222 100644 --- a/test/CXX/class.access/p6.cpp +++ b/test/CXX/class.access/p6.cpp @@ -153,3 +153,18 @@ namespace test6 { private_inner c; // expected-error {{ 'private_inner' is a private member of 'test6::A'}} }; } + +// PR9229 +namespace test7 { + void foo(int arg[1]); + class A { + void check(); + }; + class B { + friend class A; + A ins; + }; + void A::check() { + void foo(int arg[__builtin_offsetof(B, ins)]); + } +} -- 2.40.0