diff options
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 | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/error53.C | 13 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7e25e52..cc3fdde 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-06-19 Manuel Lopez-Ibanez <manu@gcc.gnu.org> + + PR c++/57638 + * pt.c (unify, [TEMPLATE_PARM_INDEX]): Pass to unify_type_mismatch + TREE_TYPE (arg), not arg itself. + 2013-06-18 Paolo Carlini <paolo.carlini@oracle.com> PR c++/53211 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 25cbf31..517f05b 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16961,7 +16961,7 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, later. */ return unify_success (explain_p); else - return unify_type_mismatch (explain_p, tparm, arg); + return unify_type_mismatch (explain_p, tparm, TREE_TYPE (arg)); /* If ARG is a parameter pack or an expansion, we cannot unify against it unless PARM is also a parameter pack. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 73e1c62..1d7c2af 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-06-19 Manuel Lopez-Ibanez <manu@gcc.gnu.org> + + PR c++/57638 + * g++.dg/template/error53.C: New. + 2013-06-19 Sebastian Huber <sebastian.huber@embedded-brains.de> PR target/55033 diff --git a/gcc/testsuite/g++.dg/template/error53.C b/gcc/testsuite/g++.dg/template/error53.C new file mode 100644 index 0000000..5976c86 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error53.C @@ -0,0 +1,13 @@ +// PR c++/57638 + +template<int x> +struct S {}; + +template<long long i> +void g(S<i>); + +void f() +{ + S<1000> t; + g(t); // { dg-error "no matching" } +} // { dg-message "mismatched types 'long long int' and 'int'" "" { target *-*-* } 12 } |