Author: rsmith
Date: Wed May 11 19:06:17 2011
New Revision: 131211
URL: http://llvm.org/viewvc/llvm-project?rev=131211&view=rev
Log:
Fix PR9902: correctly substitute alias templates within the template in which
they are defined: provide an empty list of arguments for each containing
template context during substitution.
Added:
cfe/trunk/test/SemaCXX/PR9902.cpp
Modified:
cfe/trunk/lib/Sema/SemaTemplate.cpp
Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=131211&r1=131210&r2=131211&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Wed May 11 19:06:17 2011
@@ -1855,6 +1855,9 @@
// Only substitute for the innermost template argument list.
MultiLevelTemplateArgumentList TemplateArgLists;
+ unsigned Depth = AliasTemplate->getTemplateParameters()->getDepth();
+ for (unsigned I = 0; I < Depth; ++I)
+ TemplateArgLists.addOuterTemplateArguments(0, 0);
TemplateArgLists.addOuterTemplateArguments(&TemplateArgs);
InstantiatingTemplate Inst(*this, TemplateLoc, Template);
Added: cfe/trunk/test/SemaCXX/PR9902.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/PR9902.cpp?rev=131211&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/PR9902.cpp (added)
+++ cfe/trunk/test/SemaCXX/PR9902.cpp Wed May 11 19:06:17 2011
@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x %s
+
+template <class _Tp, class _Up, bool = false>
+struct __allocator_traits_rebind
+{
+};
+
+template <template <class, class...> class _Alloc, class _Tp, class ..._Args,
+class _Up>
+struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, false>
+{
+ typedef _Alloc<_Up, _Args...> type;
+};
+
+template <class Alloc>
+struct allocator_traits
+{
+ template <class T> using rebind_alloc = typename
__allocator_traits_rebind<Alloc, T>::type;
+ template <class T> using rebind_traits = allocator_traits<rebind_alloc<T>>;
+};
+
+template <class T>
+struct allocator {};
+
+int main()
+{
+ allocator_traits<allocator<char>>::rebind_alloc<int> a;
+}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
