diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-12-01 09:34:43 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-12-01 09:34:43 +0000 |
| commit | a95888bb35e78b1c256a840d2adaf56bf8a82a1d (patch) | |
| tree | 1e667c176b0072a2df57b80a1d1c075ad147b2ca /gcc | |
| parent | 12f300a8aaec3eeb80a660e96d980faf37f607bf (diff) | |
| download | gcc-a95888bb35e78b1c256a840d2adaf56bf8a82a1d.zip gcc-a95888bb35e78b1c256a840d2adaf56bf8a82a1d.tar.gz gcc-a95888bb35e78b1c256a840d2adaf56bf8a82a1d.tar.bz2 | |
re PR c++/51367 (Broken diagnostic: 'pointer_type' not supported by dump_expr)
/cp
2011-12-01 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51367
* pt.c (unify_inconsistency): Use either %qT or %qE depending on
whether parm is a type or non-type parameter.
/cp
2011-12-01 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51367
* g++.dg/template/error47.C: New.
From-SVN: r181876
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/error47.C | 9 |
4 files changed, 30 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 55addac..9983034 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-01 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/51367 + * pt.c (unify_inconsistency): Use either %qT or %qE depending on + whether parm is a type or non-type parameter. + 2011-11-30 Jason Merrill <jason@redhat.com> PR c++/51009 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4725080..15ef7a0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5501,9 +5501,16 @@ static int unify_inconsistency (bool explain_p, tree parm, tree first, tree second) { if (explain_p) - inform (input_location, - " conflicting deductions for parameter %qE (%qE and %qE)", - parm, first, second); + { + if (TYPE_P (parm)) + inform (input_location, + " deduced conflicting types for parameter %qT (%qT and %qT)", + parm, first, second); + else + inform (input_location, + " deduced conflicting values for non-type parameter " + "%qE (%qE and %qE)", parm, first, second); + } return 1; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8e29dab..db9afc1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-01 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/51367 + * g++.dg/template/error47.C: New. + 2011-11-30 Jason Merrill <jason@redhat.com> PR c++/51009 diff --git a/gcc/testsuite/g++.dg/template/error47.C b/gcc/testsuite/g++.dg/template/error47.C new file mode 100644 index 0000000..7e360fe --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error47.C @@ -0,0 +1,9 @@ +// PR c++/51367 + +template<typename T> void foo(T, T); // { dg-message "template" } + +void bar(void* p) +{ + foo(0, p); // { dg-error "no matching" } +} +// { dg-message "candidate|parameter 'T' ('int' and 'void*')" { target *-*-* } 7 } |