diff options
| author | Jason Merrill <jason@redhat.com> | 2018-02-21 09:25:54 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-02-21 09:25:54 -0500 |
| commit | e68757438d8f5b6eacc8b95798835aada2b11668 (patch) | |
| tree | 2d6d6c87f3c83109a0d2a55403958f6980ecae64 /gcc | |
| parent | a08b5429c18215fb576380b29cffbf2a51ae21e6 (diff) | |
| download | gcc-e68757438d8f5b6eacc8b95798835aada2b11668.zip gcc-e68757438d8f5b6eacc8b95798835aada2b11668.tar.gz gcc-e68757438d8f5b6eacc8b95798835aada2b11668.tar.bz2 | |
PR c++/84454 - ICE with pack expansion in signature.
* error.c (find_typenames_r): Also stop on EXPR_PACK_EXPANSION.
From-SVN: r257875
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/error.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic172.C | 20 |
3 files changed, 26 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dd408e0..76dce82 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-02-21 Jason Merrill <jason@redhat.com> + + PR c++/84454 - ICE with pack expansion in signature. + * error.c (find_typenames_r): Also stop on EXPR_PACK_EXPANSION. + 2018-02-20 Siddhesh Poyarekar <siddhesh@sourceware.org> * cp-objcp-common.c (cxx_block_may_fallthru): Add case for diff --git a/gcc/cp/error.c b/gcc/cp/error.c index cb1dcf3..75e853a 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -1472,7 +1472,7 @@ find_typenames_r (tree *tp, int *walk_subtrees, void *data) /* Add the typename without any cv-qualifiers. */ mv = TYPE_MAIN_VARIANT (*tp); - if (TREE_CODE (*tp) == TYPE_PACK_EXPANSION) + if (PACK_EXPANSION_P (*tp)) { /* Don't mess with parameter packs since we don't remember the pack expansion context for a particular typename. */ diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic172.C b/gcc/testsuite/g++.dg/cpp0x/variadic172.C new file mode 100644 index 0000000..d25d302 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic172.C @@ -0,0 +1,20 @@ +// PR c++/84454 +// { dg-do compile { target c++11 } } + +template<class F, class... A> +void +g(F&&, A&&...) +{} + +template<class... A> +auto +h(A&&... a) -> decltype(g(0, g<decltype(a)>(a)...)) +{ + g(a...); // { dg-error "no match" } +} + +int +main() +{ + h(); +} |