diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr78701.C | 9 |
4 files changed, 26 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3404e88..4061bed 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2016-12-14 Nathan Sidwell <nathan@acm.org> + PR c++/78701 + * pt.c (type_unification_real): Check tsubst arg doesn't have + remaining template parms before converting it. + PR c++/69481 * cp-tree.h (TYPE_TEMPLATE_INFO_MAYBE_ALIAS): Always use TYPE_ALIAS_TEMPLATE_INFO for aliases. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bae96ec..a45e99c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -18991,14 +18991,19 @@ type_unification_real (tree tparms, if (DECL_P (parm)) input_location = DECL_SOURCE_LOCATION (parm); arg = tsubst_template_arg (arg, full_targs, complain, NULL_TREE); - arg = convert_template_argument (parm, arg, full_targs, complain, - i, NULL_TREE); + if (!uses_template_parms (arg)) + arg = convert_template_argument (parm, arg, full_targs, complain, + i, NULL_TREE); + else if (saw_undeduced < 2) + arg = NULL_TREE; + else + arg = error_mark_node; input_location = save_loc; *checks = get_deferred_access_checks (); pop_deferring_access_checks (); if (arg == error_mark_node) return 1; - else + else if (arg) { TREE_VEC_ELT (targs, i) = arg; /* The position of the first default template argument, @@ -19006,7 +19011,6 @@ type_unification_real (tree tparms, Record that. */ if (!NON_DEFAULT_TEMPLATE_ARGS_COUNT (targs)) SET_NON_DEFAULT_TEMPLATE_ARGS_COUNT (targs, i); - continue; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9f7fa7e..47a98ac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-12-14 Nathan Sidwell <nathan@acm.org> + + PR c++/78701 + * g++.dg/cpp0x/pr78701.C: New. + 2016-12-14 Michael Meissner <meissner@linux.vnet.ibm.com> * gcc/testsuite/gcc.target/powerpc/vec-extract.h: If DO_TRACE is diff --git a/gcc/testsuite/g++.dg/cpp0x/pr78701.C b/gcc/testsuite/g++.dg/cpp0x/pr78701.C new file mode 100644 index 0000000..6fef926 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr78701.C @@ -0,0 +1,9 @@ +// PR c++/58707 +// { dg-do compile { target c++11 } } + +// ICE during deduction of default parms + +template <class T, T N = T(), bool B = N> + void f(T x) {} + +template void f<int> (int); |