diff options
| author | Jason Merrill <jason@redhat.com> | 2017-02-03 14:44:21 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-02-03 14:44:21 -0500 |
| commit | 99be38ec6a484b92940c2d415e14db33ebfb19bc (patch) | |
| tree | e8b2d429ae4e5e7f849bd9e5d2b838cecf0f8668 /gcc | |
| parent | 10613537a958bf1e73679e93f92e7e1032738b47 (diff) | |
| download | gcc-99be38ec6a484b92940c2d415e14db33ebfb19bc.zip gcc-99be38ec6a484b92940c2d415e14db33ebfb19bc.tar.gz gcc-99be38ec6a484b92940c2d415e14db33ebfb19bc.tar.bz2 | |
PR c++/79294 - ICE with invalid template argument
* pt.c (convert_nontype_argument_function): Check value-dependence.
(convert_nontype_argument): Don't check it here for function ptrs.
From-SVN: r245168
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/error57.C | 5 |
3 files changed, 16 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 96136af..8f65db5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-02-03 Jason Merrill <jason@redhat.com> + + PR c++/79294 - ICE with invalid template argument + * pt.c (convert_nontype_argument_function): Check value-dependence. + (convert_nontype_argument): Don't check it here for function ptrs. + 2017-02-02 Richard Biener <rguenther@suse.de> PR cp/14179 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c69c270..4c4941a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5966,6 +5966,9 @@ convert_nontype_argument_function (tree type, tree expr, if (fn == error_mark_node) return error_mark_node; + if (value_dependent_expression_p (fn)) + return fn; + fn_no_ptr = strip_fnptr_conv (fn); if (TREE_CODE (fn_no_ptr) == ADDR_EXPR) fn_no_ptr = TREE_OPERAND (fn_no_ptr, 0); @@ -6698,8 +6701,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) /* Null pointer values are OK in C++11. */ return perform_qualification_conversions (type, expr); - if (!value_dependent_expression_p (expr)) - expr = convert_nontype_argument_function (type, expr, complain); + expr = convert_nontype_argument_function (type, expr, complain); if (!expr || expr == error_mark_node) return expr; } @@ -6723,8 +6725,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) return NULL_TREE; } - if (!value_dependent_expression_p (expr)) - expr = convert_nontype_argument_function (type, expr, complain); + expr = convert_nontype_argument_function (type, expr, complain); if (!expr || expr == error_mark_node) return expr; } diff --git a/gcc/testsuite/g++.dg/template/error57.C b/gcc/testsuite/g++.dg/template/error57.C new file mode 100644 index 0000000..f67e0a6 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error57.C @@ -0,0 +1,5 @@ +// PR c++/79294 + +template <int()> struct a; +template <int(b)> a < b // { dg-error "int" } +// { dg-error "expected" "" { target *-*-* } .-1 } |