diff options
| author | John McCall <rjmccall@apple.com> | 2010-08-19 23:06:02 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-08-19 23:06:02 +0000 |
| commit | 766724566289e6951a90b6483f0d3e22fe4b9b52 (patch) | |
| tree | 4eb5543663794849d80fa9706dd2424f920d5811 /lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | 21e09b63df2e1cc1e18749839bf21a6adb9a5b3a (diff) | |
Correctly instantiate templates with non-type template arguments that
are local externs. Fixes <rdar://problem/8302138>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111570 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 6fc95634ab..cfae30c0ad 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2559,7 +2559,7 @@ NamedDecl *Sema::FindInstantiatedDecl(SourceLocation Loc, NamedDecl *D, DeclContext *ParentDC = D->getDeclContext(); if (isa<ParmVarDecl>(D) || isa<NonTypeTemplateParmDecl>(D) || isa<TemplateTypeParmDecl>(D) || isa<TemplateTemplateParmDecl>(D) || - ParentDC->isFunctionOrMethod()) { + (ParentDC->isFunctionOrMethod() && ParentDC->isDependentContext())) { // D is a local of some kind. Look into the map of local // declarations to their instantiations. return cast<NamedDecl>(CurrentInstantiationScope->getInstantiationOf(D)); |