diff options
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/temp_arg_pack.cpp | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index f4ec04a1b29..a5a51d54830 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -9984,7 +9984,7 @@ static void DiagnoseBadDeduction(Sema &S, NamedDecl *Found, Decl *Templated, 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 diff --git a/clang/test/SemaTemplate/temp_arg_pack.cpp b/clang/test/SemaTemplate/temp_arg_pack.cpp index b79dca78bce..26e3f6ba5e5 100644 --- a/clang/test/SemaTemplate/temp_arg_pack.cpp +++ b/clang/test/SemaTemplate/temp_arg_pack.cpp @@ -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>{}; +} |
