From 480d58a2a89ad23077fb3fb2ea84f192a323adee Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 3 Jul 2018 12:27:04 -0400 Subject: [PATCH] PR c++/86378 - functional cast in noexcept-specifier. * tree.c (strip_typedefs_expr) [TREE_LIST]: Fix iteration. From-SVN: r262352 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/tree.c | 4 ++-- gcc/testsuite/g++.dg/cpp0x/noexcept33.C | 28 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept33.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a9fcc709a923..4cc49d77cff5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-07-03 Jason Merrill + + PR c++/86378 - functional cast in noexcept-specifier. + * tree.c (strip_typedefs_expr) [TREE_LIST]: Fix iteration. + 2018-06-26 Jason Merrill PR c++/80290 - memory-hog with std::pair. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 3b25ab92a157..f24e272b0fdb 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1670,9 +1670,9 @@ strip_typedefs_expr (tree t, bool *remove_attributes) tree it; for (it = t; it; it = TREE_CHAIN (it)) { - tree val = strip_typedefs_expr (TREE_VALUE (t), remove_attributes); + tree val = strip_typedefs_expr (TREE_VALUE (it), remove_attributes); vec_safe_push (vec, val); - if (val != TREE_VALUE (t)) + if (val != TREE_VALUE (it)) changed = true; gcc_assert (TREE_PURPOSE (it) == NULL_TREE); } diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept33.C b/gcc/testsuite/g++.dg/cpp0x/noexcept33.C new file mode 100644 index 000000000000..c5a03de38dd1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/noexcept33.C @@ -0,0 +1,28 @@ +// PR c++/86378 +// { dg-do compile { target c++11 } } + +struct Pepper {}; +struct Apple { Apple(int) {} }; + +struct Combination : Apple, Pepper +{ + Combination(Pepper p, Apple a) + : Apple(a), Pepper(p) + {} +}; + +struct MyCombination +{ + using Spice = Pepper; + using Fruit = Apple; + + Combination combination; + + template + constexpr MyCombination(T&& t) + noexcept(noexcept(Combination(Spice(), Fruit(t)))) + : combination(Spice(), Fruit(t)) + {} +}; + +MyCombination obj(Apple(4)); -- 2.47.2