commit 9f44d1453b67a6d9e7acb8a68146fc23261c3e57
author Douglas Gregor <dgregor@apple.com> Fri May 21 21:25:08 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Fri May 21 21:25:08 2010 +0000
tree 346a27731549b5fb020337d25ba47b42f3bb7574
parent 2c8bdead9e78aa63a19536cf0af453cbc1955533

When instantiating a function declaration within a function template,
be sure to merge its parameter scope with its parent's scope. Fixes
PR7184.

llvm-svn: 104386

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index e8cbb66..10d2bb1 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -970,6 +970,7 @@
     isFriend = (D->getFriendObjectKind() != Decl::FOK_None);
 
   bool MergeWithParentScope = (TemplateParams != 0) ||
+    Owner->isFunctionOrMethod() ||
     !(isa<Decl>(Owner) && 
       cast<Decl>(Owner)->isDefinedOutsideFunctionOrMethod());
   Sema::LocalInstantiationScope Scope(SemaRef, MergeWithParentScope);