diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-07-13 20:05:58 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-07-13 20:05:58 +0000 |
| commit | e7ffbe233ed04f921a008ed893672ee759d1a0ad (patch) | |
| tree | 3ee297421bcb2b1f6583e769cfbf3e2bf5608cd8 /lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | 90a8f27f144233b53cac0c88a1595f7f05105b7e (diff) | |
More block instantiation stuff. Set variable/param DeclContext
to block context when first instantiating them.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108266 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 2fd3528532..b80e824bfd 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -400,6 +400,9 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) { SemaRef.CurrentInstantiationScope->InstantiatedLocal(D, Var); } InstantiateAttrs(D, Var); + // Set DeclContext if inside a Block. + if (BlockScopeInfo *CurBlock = SemaRef.getCurBlock()) + D->setDeclContext(CurBlock->TheDecl); // Link instantiations of static data members back to the template from // which they were instantiated. |