From 70b21be38012d6888f70cc62c6574b44c77a1cd8 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Mon, 3 May 2010 20:22:41 +0000
Subject: When instantiating a function-local variable definition, introduce
 the mapping from the declaration in the template to the instantiated
 declaration before transforming the initializer, in case some crazy lunatic
 decides to use a variable in its own initializer. Fixes PR7016.

llvm-svn: 102945
---
 clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 8974ecbdf42..a81e5e95f89 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -365,6 +365,9 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) {
     Owner->makeDeclVisibleInContext(Var);
   } else {
     Owner->addDecl(Var);
+    
+    if (Owner->isFunctionOrMethod())
+      SemaRef.CurrentInstantiationScope->InstantiatedLocal(D, Var);
   }
 
   // Link instantiations of static data members back to the template from
-- 
cgit v1.2.3