commit ea2f70f10f7ef7467432537bdba9244267fd7e9a
author Douglas Gregor <doug.gregor@gmail.com> Fri Aug 28 21:09:48 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Fri Aug 28 21:09:48 2009 +0000
tree f3d0a24c570d3aa228bec174a79f87ed3c8f2745
parent 01b7a1cbc3db8c881a2a565de4ec68340dbe3f4a

Fix and test template instantiation for nested member templates.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80394 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 2138557..732394d 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -947,9 +947,12 @@
   
   // Find the function body that we'll be substituting.
   const FunctionDecl *PatternDecl = 0;
-  if (FunctionTemplateDecl *Primary = Function->getPrimaryTemplate())
+  if (FunctionTemplateDecl *Primary = Function->getPrimaryTemplate()) {
+    while (Primary->getInstantiatedFromMemberTemplate())
+      Primary = Primary->getInstantiatedFromMemberTemplate();
+    
     PatternDecl = Primary->getTemplatedDecl();
-  else 
+  } else 
     PatternDecl = Function->getInstantiatedFromMemberFunction();
   Stmt *Pattern = 0;
   if (PatternDecl)