r325646 - Fix assert when template argument deduction's original call arg checking triggers class template instantiation.

[Richard Smith via cfe-commits]

Author: rsmith
Date: Tue Feb 20 15:47:12 2018
New Revision: 325646

URL: http://llvm.org/viewvc/llvm-project?rev=325646&view=rev
Log:
Fix assert when template argument deduction's original call arg checking triggers class template instantiation.

Added:
    cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp
Modified:
    cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=325646&r1=325645&r2=325646&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp Tue Feb 20 15:47:12 2018
@@ -3084,7 +3084,7 @@ CheckOriginalCallArgDeduction(Sema &S, T
     return Sema::TDK_Success;
 
   if (A->isRecordType() && isSimpleTemplateIdType(OriginalParamType) &&
-      S.IsDerivedFrom(SourceLocation(), A, DeducedA))
+      S.IsDerivedFrom(Info.getLocation(), A, DeducedA))
     return Sema::TDK_Success;
 
   return Failed();

Added: cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp?rev=325646&view=auto
==============================================================================
--- cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp (added)
+++ cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp Tue Feb 20 15:47:12 2018
@@ -0,0 +1,8 @@
+// RUN: %clang_cc1 -verify %s
+
+namespace deduce_pack_non_pack {
+  template <typename...> class A;
+  template <typename> struct C {};
+  template <typename T> void g(C<A<T>>); // expected-note {{candidate template ignored: deduced type 'C<A<[...], (no argument)>>' of 1st parameter does not match adjusted type 'C<A<[...], int>>' of argument [with T = bool]}}
+  void h(C<A<bool, int>> &x) { g(x); } // expected-error {{no matching function}}
+}