diff options
author | Patrick Palka <ppalka@redhat.com> | 2020-05-18 23:50:14 -0400 |
---|---|---|
committer | Patrick Palka <ppalka@redhat.com> | 2020-05-18 23:50:14 -0400 |
commit | 864fed4a491606a7b17325d847e1d723d2a44104 (patch) | |
tree | 6b49a44d1ceb3f97e39ca32235262225c1fcfdf9 /gcc | |
parent | 489fb00b14d43ee70d9a0f82f6525d7ffd34e065 (diff) | |
download | gcc-864fed4a491606a7b17325d847e1d723d2a44104.zip gcc-864fed4a491606a7b17325d847e1d723d2a44104.tar.gz gcc-864fed4a491606a7b17325d847e1d723d2a44104.tar.bz2 |
c++: Explain fn template argument type/value mismatches [PR66439]
In fn_type_unifcation, we are passing NULL_TREE as the 'in_decl'
parameter to coerce_template_parms, and this is causing template
type/value mismatch error messages to get suppressed regardless of the
value of 'complain'.
This means that when substitution into a function template fails due to
a type/value mismatch between a template parameter and the provided
template argument, we just say "template argument deduction/substitution
failed:" without a followup explanation of the failure.
Fix this by passing 'fn' instead of NULL_TREE to coerce_template_parms.
gcc/cp/ChangeLog:
PR c++/66439
* pt.c (fn_type_unification): Pass 'fn' instead of NULL_TREE as
the 'in_decl' parameter to coerce_template_parms.
gcc/testsuite/ChangeLog:
PR c++/66439
* g++.dg/cpp2a/concepts-ts4.C: Expect a "type/value mismatch"
diagnostic.
* g++.dg/cpp2a/concepts-ts6.C: Likewise.
* g++.dg/template/error56.C: Likewise.
* g++.dg/template/error59.C: New test.
libstdc++-v3/ChangeLog:
PR c++/66439
* testsuite/20_util/pair/astuple/get_neg.cc: Prune "type/value
mismatch" messages.
* testsuite/20_util/tuple/element_access/get_neg.cc: Likewise.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/cp/pt.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 9 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C | 2 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/error56.C | 2 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/error59.C | 11 |
7 files changed, 34 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4e44658..cd81891 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2020-05-19 Patrick Palka <ppalka@redhat.com> + + PR c++/66439 + * pt.c (fn_type_unification): Pass 'fn' instead of NULL_TREE as + the 'in_decl' parameter to coerce_template_parms. + 2020-05-18 Marek Polacek <polacek@redhat.com> PR c++/94955 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index cad5b21..50933cb 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -20989,7 +20989,7 @@ fn_type_unification (tree fn, /* Adjust any explicit template arguments before entering the substitution context. */ explicit_targs - = (coerce_template_parms (tparms, explicit_targs, NULL_TREE, + = (coerce_template_parms (tparms, explicit_targs, fn, complain|tf_partial, /*require_all_args=*/false, /*use_default_args=*/false)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 02de802..b0315b0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-05-19 Patrick Palka <ppalka@redhat.com> + + PR c++/66439 + * g++.dg/cpp2a/concepts-ts4.C: Expect a "type/value mismatch" + diagnostic. + * g++.dg/cpp2a/concepts-ts6.C: Likewise. + * g++.dg/template/error56.C: Likewise. + * g++.dg/template/error59.C: New test. + 2020-05-18 Marek Polacek <polacek@redhat.com> PR c++/94955 diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C index 23ed929..cc49ff4 100644 --- a/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C @@ -31,4 +31,6 @@ void driver() fn<0>(); // OK fn<-1>(); // { dg-error "" } fn<int>(); // { dg-error "no matching function" } + // { dg-error "type/value mismatch at argument 1" "" { target *-*-* } .-1 } + // { dg-message "expected a constant of type .int., got .int." "" { target *-*-* } .-2 } } diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C index 597ad5e..8aede57 100644 --- a/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C @@ -25,6 +25,8 @@ void driver1() { f<X>(); f<int>(); // { dg-error "no matching function for call" } + // { dg-error "type/value mismatch at argument 1" "" { target *-*-* } .-1 } + // { dg-message "expected a class template, got .int." "" { target *-*-* } .-2 } S2<int> s2a; S2<char, signed char, unsigned char> s2b; @@ -69,4 +71,4 @@ void driver2() S6<void, void> s6a; S6<void, int> s6c; // { dg-error "template constraint failure" } S6<void, void, void> s6b; // { dg-error "wrong number of template arguments" } -}
\ No newline at end of file +} diff --git a/gcc/testsuite/g++.dg/template/error56.C b/gcc/testsuite/g++.dg/template/error56.C index 3eda04c..e85471a 100644 --- a/gcc/testsuite/g++.dg/template/error56.C +++ b/gcc/testsuite/g++.dg/template/error56.C @@ -9,4 +9,6 @@ struct A int main() { A().f<1>(); // { dg-error "f<1>" } + // { dg-error "type/value mismatch at argument 1" "" { target *-*-* } .-1 } + // { dg-message "expected a type, got .1." "" { target *-*-* } .-2 } } diff --git a/gcc/testsuite/g++.dg/template/error59.C b/gcc/testsuite/g++.dg/template/error59.C new file mode 100644 index 0000000..f81a28c2 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error59.C @@ -0,0 +1,11 @@ +template<int N> struct S { }; + +template<template<typename> class TT> +void foo(); + +void bar() +{ + foo<S>(); // { dg-error "no matching function" } + // { dg-error "type/value mismatch at argument 1" "" { target *-*-* } .-1 } + // { dg-message "expected a template of type .template<class> class TT., got .template<int N> struct S." "" { target *-*-* } .-2 } +} |