diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index f236d16..dbae6e9 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -1264,10 +1264,12 @@
       // We could support this with the GCC extension
       // DW_TAG_GNU_template_template_param
       break;
+    case TemplateArgument::Pack:
+      // And this with DW_TAG_GNU_template_parameter_pack
+      break;
     // these next 4 should never occur
     case TemplateArgument::Expression:
     case TemplateArgument::TemplateExpansion:
-    case TemplateArgument::Pack:
     case TemplateArgument::Null:
       llvm_unreachable(
           "These argument types shouldn't exist in concrete types");
diff --git a/test/CodeGenCXX/debug-info-template.cpp b/test/CodeGenCXX/debug-info-template.cpp
index 7b987ef..1d2dc10 100644
--- a/test/CodeGenCXX/debug-info-template.cpp
+++ b/test/CodeGenCXX/debug-info-template.cpp
@@ -1,5 +1,12 @@
 // RUN: %clang -S -emit-llvm -target x86_64-unknown_unknown -g %s -o - -std=c++11 | FileCheck %s
 
+// CHECK: [[EMPTY:![0-9]*]] = metadata !{i32 0}
+
+// func<...> doesn't have any template arguments listed since we don't support
+// packs yet. This could be encoded with GNU's
+// DW_TAG_GNU_template_parameter_pack extension.
+// CHECK: {{.*}}, metadata [[EMPTY]], i32 {{[0-9]*}}} ; [ DW_TAG_subprogram ] {{.*}} [func<int>]
+
 // CHECK: [[INT:![0-9]*]] = {{.*}} ; [ DW_TAG_base_type ] [int]
 // CHECK: metadata [[TCI:![0-9]*]], i32 0, i32 1, %class.TC* @tci, null} ; [ DW_TAG_variable ] [tci]
 // CHECK: [[TC:![0-9]*]] = {{.*}}, metadata [[TCARGS:![0-9]*]]} ; [ DW_TAG_class_type ] [TC<unsigned int, 2, &glb, &foo::e, &foo::f>]
@@ -67,3 +74,6 @@
 
 TC<unsigned, 2, &glb, &foo::e, &foo::f> tci;
 TC<int, -3, nullptr, nullptr, nullptr> tcn;
+
+template<typename ...Ts> int func() { return 0; }
+int anchor = func<int>();