commit d8a52a7831e19eb7a7d9a3be83bbd93078cca6c3
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Nov 12 01:43:45 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Nov 12 01:43:45 2014 +0000
tree a46bab50d768fd577750fba17df0876b977d96f1
parent f44dbda5427bcbdcb7f2c22c57bff8f901ff515a

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.

llvm-svn: 221748

clang/lib/Sema/SemaTemplate.cpp

diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index 1bddfe2..50a4298 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -3749,7 +3749,7 @@
         }
 
         // Push the argument pack onto the list of converted arguments.
-        if (InFinalParameterPack) {
+        if (InFinalParameterPack && !ArgumentPack.empty()) {
           Converted.push_back(
             TemplateArgument::CreatePackCopy(Context,
                                              ArgumentPack.data(),