commit 357bbd022c1d340c8e255aea7a684ddb34bc76e5
author Douglas Gregor <dgregor@apple.com> Fri Aug 28 20:50:45 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Aug 28 20:50:45 2009 +0000
tree 668efdbda10cd6080ad5057c6922ecb3f0278fce
parent c18faf67c366f79035e364944d7df7f281ddf5a4

Tighten up the conversion from a single-level template argument list
to a multi-level template argument list by making it explicit. The
forced auditing of callers found a bug in the instantiation of member
classes inside member templates.

I *love* static type systems.



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

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 4fa09d8..d72cea0 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -1319,7 +1319,8 @@
 
         TemplateArgumentList TemplateArgs(Context, Converted,
                                           /*TakeArgs=*/false);
-        NTTPType = SubstType(NTTPType, TemplateArgs,
+        NTTPType = SubstType(NTTPType, 
+                             MultiLevelTemplateArgumentList(TemplateArgs),
                              NTTP->getLocation(),
                              NTTP->getDeclName());
         // If that worked, check the non-type template parameter type