From cddc69fc3fe17b043a287a41e3706766c3d09a79 Mon Sep 17 00:00:00 2001 From: Sebastian Redl Date: Thu, 8 Jul 2010 23:07:34 +0000 Subject: [PATCH] When looking for an entity's Scope, don't consider scopes that can't contain declarations. Fixes PR7594. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@107927 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/Sema.cpp | 9 ++++++--- test/SemaCXX/implicit-member-functions.cpp | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp index 6194c293d2..cddc84eeed 100644 --- a/lib/Sema/Sema.cpp +++ b/lib/Sema/Sema.cpp @@ -405,9 +405,12 @@ Scope *Sema::getScopeForContext(DeclContext *Ctx) { Ctx = Ctx->getPrimaryContext(); for (Scope *S = getCurScope(); S; S = S->getParent()) { - if (DeclContext *Entity = static_cast (S->getEntity())) - if (Ctx == Entity->getPrimaryContext()) - return S; + // Ignore scopes that cannot have declarations. This is important for + // out-of-line definitions of static class members. + if (S->getFlags() & (Scope::DeclScope | Scope::TemplateParamScope)) + if (DeclContext *Entity = static_cast (S->getEntity())) + if (Ctx == Entity->getPrimaryContext()) + return S; } return 0; diff --git a/test/SemaCXX/implicit-member-functions.cpp b/test/SemaCXX/implicit-member-functions.cpp index 79cc3679f4..5333094d53 100644 --- a/test/SemaCXX/implicit-member-functions.cpp +++ b/test/SemaCXX/implicit-member-functions.cpp @@ -39,3 +39,14 @@ namespace PR6570 { }; } + +namespace PR7594 { + // If the lazy declaration of special member functions is triggered + // in an out-of-line initializer, make sure the functions aren't in + // the initializer scope. This used to crash Clang: + struct C { + C(); + static C *c; + }; + C *C::c = new C(); +} -- 2.40.0