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 | a6c7efec2bb7386ea40f5203d286fb90520f5b71 (patch) | |
| tree | 33c7bb14c9130ad369504cda4e4994de07f625dc /clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | 76a6b663a360bb115be888fd5836d5afa1f86699 (diff) | |
| download | bcm5719-llvm-a6c7efec2bb7386ea40f5203d286fb90520f5b71.tar.gz bcm5719-llvm-a6c7efec2bb7386ea40f5203d286fb90520f5b71.zip | |
More block instantiation stuff. Set variable/param DeclContext
to block context when first instantiating them.
llvm-svn: 108266
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 2fd35285324..b80e824bfd6 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/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. |
