diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -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/pr88795.C | 23 | ||||
| -rw-r--r-- | gcc/tree.c | 2 |
6 files changed, 44 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 83d4fa4..e1ae217 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-01-15 David Malcolm <dmalcolm@redhat.com> + + PR c++/88795 + * tree.c (build_function_type): Assert that arg_types is not + error_mark_node. + 2019-01-15 Richard Sandiford <richard.sandiford@arm.com> PR inline-asm/52813 diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 35eec34..7cf0ffb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-01-15 David Malcolm <dmalcolm@redhat.com> + + PR c++/88795 + * pt.c (build_deduction_guide): Bail out if tsubst_arg_types + fails. + 2019-01-15 Paolo Carlini <paolo.carlini@oracle.com> * decl.c (start_decl): Improve error location. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index f062a2b..c6fc1cf 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -26932,6 +26932,8 @@ build_deduction_guide (tree ctor, tree outer_args, tsubst_flags_t complain) targs = template_parms_to_args (tparms); fparms = tsubst_arg_types (fparms, tsubst_args, NULL_TREE, complain, ctor); + if (fparms == error_mark_node) + ok = false; fargs = tsubst (fargs, tsubst_args, complain, ctor); if (ci) ci = tsubst_constraint_info (ci, tsubst_args, complain, ctor); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ec8a0c1..d226aa5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-15 David Malcolm <dmalcolm@redhat.com> + + PR c++/88795 + * g++.dg/template/pr88795.C: New test. + 2019-01-15 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/43136 diff --git a/gcc/testsuite/g++.dg/template/pr88795.C b/gcc/testsuite/g++.dg/template/pr88795.C new file mode 100644 index 0000000..918aa6d --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pr88795.C @@ -0,0 +1,23 @@ +// { dg-do compile { target c++17 } } + +template<class, int> +struct Array {}; + +template<class T, int size_> +struct Foo { + static constexpr int size() { + return size_; + } + + template<class U> + Foo(U, Array<T, size()>) {} +}; + +template<class T, int size, class U> +Foo(U, Array<T, size>) -> Foo<T, size>; + +int main() { + Array<int, 2> arr{}; + + Foo foo{2.0, arr}; +} @@ -8455,6 +8455,8 @@ build_function_type (tree value_type, tree arg_types) bool any_structural_p, any_noncanonical_p; tree canon_argtypes; + gcc_assert (arg_types != error_mark_node); + if (TREE_CODE (value_type) == FUNCTION_TYPE) { error ("function return type cannot be function"); |