From dc70c7707542425e4a4fa651fc6477c301eba472 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 19 Jun 2015 18:15:30 +0000 Subject: [PATCH] PR c++/65973 * constexpr.c (build_constexpr_constructor_member_initializers): Handle an empty STATEMENT_LIST. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224677 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/constexpr.c | 8 ++++---- gcc/testsuite/g++.dg/cpp1y/constexpr-empty1.C | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/constexpr-empty1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4f2d4a6..2f5e0fa 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2015-06-19 Jason Merrill + PR c++/65973 + * constexpr.c (build_constexpr_constructor_member_initializers): + Handle an empty STATEMENT_LIST. + PR c++/65843 * pt.c (tsubst_copy_and_build): Register a capture proxy in local_specializations. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 5688588..f6e2bc8 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -537,16 +537,16 @@ build_constexpr_constructor_member_initializers (tree type, tree body) body = TREE_OPERAND (body, 0); if (TREE_CODE (body) == STATEMENT_LIST) { - tree_stmt_iterator i = tsi_start (body); - while (true) + for (tree_stmt_iterator i = tsi_start (body); + !tsi_end_p (i); tsi_next (&i)) { body = tsi_stmt (i); if (TREE_CODE (body) == BIND_EXPR) break; - tsi_next (&i); } } - body = BIND_EXPR_BODY (body); + if (TREE_CODE (body) == BIND_EXPR) + body = BIND_EXPR_BODY (body); if (TREE_CODE (body) == CLEANUP_POINT_EXPR) { body = TREE_OPERAND (body, 0); diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-empty1.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-empty1.C new file mode 100644 index 0000000..5be44ea --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-empty1.C @@ -0,0 +1,6 @@ +// PR c++/65973 +// { dg-do compile { target c++14 } } + +class foo { + constexpr foo() noexcept { __func__; }; +}; -- 2.7.4