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/SemaTemplateInstantiate.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/SemaTemplateInstantiate.cpp')
-rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index 6db0916e445..539b4c409fd 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1067,6 +1067,10 @@ ParmVarDecl *Sema::SubstParmVarDecl(ParmVarDecl *OldParm, NewParm->setHasInheritedDefaultArg(OldParm->hasInheritedDefaultArg()); CurrentInstantiationScope->InstantiatedLocal(OldParm, NewParm); + // Set DeclContext if inside a Block. + if (BlockScopeInfo *CurBlock = getCurBlock()) + NewParm->setDeclContext(CurBlock->TheDecl); + return NewParm; } |