[llvm-branch-commits] [cfe-branch] r223718 - Merging r221748:

[Tom Stellard]

Author: tstellar
Date: Mon Dec  8 17:38:45 2014
New Revision: 223718

URL: http://llvm.org/viewvc/llvm-project?rev=223718&view=rev
Log:
Merging r221748:

------------------------------------------------------------------------
r221748 | richard-llvm | 2014-11-11 20:43:45 -0500 (Tue, 11 Nov 2014) | 4 lines

PR21536: Fix a corner case where we'd get confused by a pack expanding into the
penultimate parameter of a template parameter list, where the last parameter is
itself a pack, and build a bogus empty final pack argument.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_35/lib/Sema/SemaTemplate.cpp
    cfe/branches/release_35/test/SemaTemplate/deduction.cpp

Modified: cfe/branches/release_35/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/lib/Sema/SemaTemplate.cpp?rev=223718&r1=223717&r2=223718&view=diff
==============================================================================
--- cfe/branches/release_35/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/branches/release_35/lib/Sema/SemaTemplate.cpp Mon Dec  8 17:38:45 2014
@@ -3746,7 +3746,7 @@ bool Sema::CheckTemplateArgumentList(Tem
         }
 
         // Push the argument pack onto the list of converted arguments.
-        if (InFinalParameterPack) {
+        if (InFinalParameterPack && !ArgumentPack.empty()) {
           Converted.push_back(
             TemplateArgument::CreatePackCopy(Context,
                                              ArgumentPack.data(),

Modified: cfe/branches/release_35/test/SemaTemplate/deduction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/test/SemaTemplate/deduction.cpp?rev=223718&r1=223717&r2=223718&view=diff
==============================================================================
--- cfe/branches/release_35/test/SemaTemplate/deduction.cpp (original)
+++ cfe/branches/release_35/test/SemaTemplate/deduction.cpp Mon Dec  8 17:38:45 2014
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++11
 
 // Template argument deduction with template template parameters.
 template<typename T, template<T> class A> 
@@ -162,3 +162,19 @@ namespace test14 {
     foo(a);
   }
 }
+
+namespace PR21536 {
+  template<typename ...T> struct X;
+  template<typename A, typename ...B> struct S {
+    static_assert(sizeof...(B) == 1, "");
+    void f() {
+      using T = A;
+      using T = int;
+
+      using U = X<B...>;
+      using U = X<int>;
+    }
+  };
+  template<typename ...T> void f(S<T...>);
+  void g() { f(S<int, int>()); }
+}