diff options
| author | Jason Merrill <jason@redhat.com> | 2015-06-19 14:15:30 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-06-19 14:15:30 -0400 |
| commit | 30ac6e80ba51480a0066329338b3ea5dbf423c26 (patch) | |
| tree | e8907159b9e482c6276fef7e66ef8e306dd27fb5 /gcc | |
| parent | 892562cf28252bd284a4cd4d249f20c1755a6b5b (diff) | |
| download | gcc-30ac6e80ba51480a0066329338b3ea5dbf423c26.zip gcc-30ac6e80ba51480a0066329338b3ea5dbf423c26.tar.gz gcc-30ac6e80ba51480a0066329338b3ea5dbf423c26.tar.bz2 | |
re PR c++/65973 (segmentation fault when compiling C++14 code)
PR c++/65973
* constexpr.c (build_constexpr_constructor_member_initializers):
Handle an empty STATEMENT_LIST.
From-SVN: r224677
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/constexpr-empty1.C | 6 |
3 files changed, 14 insertions, 4 deletions
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 <jason@redhat.com> + 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__; }; +}; |