r344070 - PR39231: fix null dereference when diagnosing deduction failure due to

[Richard Smith via cfe-commits]

Author: rsmith
Date: Tue Oct  9 11:49:22 2018
New Revision: 344070

URL: http://llvm.org/viewvc/llvm-project?rev=344070&view=rev
Log:
PR39231: fix null dereference when diagnosing deduction failure due to
conflicting values for a non-type pack.

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

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=344070&r1=344069&r2=344070&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Tue Oct  9 11:49:22 2018
@@ -9984,7 +9984,7 @@ static void DiagnoseBadDeduction(Sema &S
           DeductionFailure.getFirstArg()->getNonTypeTemplateArgumentType();
       QualType T2 =
           DeductionFailure.getSecondArg()->getNonTypeTemplateArgumentType();
-      if (!S.Context.hasSameType(T1, T2)) {
+      if (!T1.isNull() && !T2.isNull() && !S.Context.hasSameType(T1, T2)) {
         S.Diag(Templated->getLocation(),
                diag::note_ovl_candidate_inconsistent_deduction_types)
           << ParamD->getDeclName() << *DeductionFailure.getFirstArg() << T1

Modified: cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp?rev=344070&r1=344069&r2=344070&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp (original)
+++ cfe/trunk/test/SemaTemplate/temp_arg_pack.cpp Tue Oct  9 11:49:22 2018
@@ -6,3 +6,19 @@ namespace deduce_pack_non_pack {
   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}}
 }
+
+namespace pr39231 {
+  template<typename T, T ...V> struct integer_sequence {};
+
+  template <typename T, T... A, T... B>
+  int operator^(integer_sequence<T, A...> a, // expected-note {{deduced conflicting values for parameter 'A' (<1, 2, 3> vs. <4, 5, 6>)}}
+                integer_sequence<T, A...> b);
+
+  int v = integer_sequence<int, 1, 2, 3>{} ^ integer_sequence<int, 4, 5, 6>{}; // expected-error {{invalid operands}}
+
+  template <typename T, T... A, T... B>
+  integer_sequence<T, A + B...> operator+(integer_sequence<T, A...> a,
+                                          integer_sequence<T, B...> b);
+  integer_sequence<int, 5, 7, 9> w =
+      integer_sequence<int, 1, 2, 3>{} + integer_sequence<int, 4, 5, 6>{};
+}