diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-01-25 09:11:31 -0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-01-25 09:11:31 -0800 |
| commit | eb7ae6f03e3b6dad5177ebff69d483e026350b59 (patch) | |
| tree | 3d7c2f82711e3cc8913bdc95b23eb6988100bfcd /gcc-4.7 | |
| parent | 7f9f4477cbebb22723af8c0fac55aefc1228e02c (diff) | |
| download | toolchain_gcc-eb7ae6f03e3b6dad5177ebff69d483e026350b59.tar.gz toolchain_gcc-eb7ae6f03e3b6dad5177ebff69d483e026350b59.tar.bz2 toolchain_gcc-eb7ae6f03e3b6dad5177ebff69d483e026350b59.zip | |
Fix GCC 4.7 ICE in build_data_member_initialization, at cp/semantics.c:5790
2013-01-03 Jason Merrill <jason@redhat.com>
PR c++/55856
* semantics.c (build_data_member_initialization): Handle DECL_EXPR.
Change-Id: Ib34c16c4bc714875a49831ef8fb1691b392640cd
Diffstat (limited to 'gcc-4.7')
| -rw-r--r-- | gcc-4.7/ChangeLog.backported | 4 | ||||
| -rw-r--r-- | gcc-4.7/gcc/cp/semantics.c | 8 | ||||
| -rw-r--r-- | gcc-4.7/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C | 16 |
3 files changed, 26 insertions, 2 deletions
diff --git a/gcc-4.7/ChangeLog.backported b/gcc-4.7/ChangeLog.backported index 47affab31..ffcd5a64e 100644 --- a/gcc-4.7/ChangeLog.backported +++ b/gcc-4.7/ChangeLog.backported @@ -24,3 +24,7 @@ http://gcc.gnu.org/viewcvs?view=revision&revision=186451 * rtl.h (delete_insn, delete_insn_and_edges): Change return type to void. * cfglayout.c (fixup_reorder_chain): Delete unused label. + +2013-01-03 Jason Merrill <jason@redhat.com> + PR c++/55856 + * semantics.c (build_data_member_initialization): Handle DECL_EXPR. diff --git a/gcc-4.7/gcc/cp/semantics.c b/gcc-4.7/gcc/cp/semantics.c index a64c5b7f4..b4d721db5 100644 --- a/gcc-4.7/gcc/cp/semantics.c +++ b/gcc-4.7/gcc/cp/semantics.c @@ -5785,15 +5785,19 @@ build_data_member_initialization (tree t, VEC(constructor_elt,gc) **vec) member = TREE_OPERAND (t, 0); init = unshare_expr (TREE_OPERAND (t, 1)); } - else + else if (TREE_CODE (t) == CALL_EXPR) { - gcc_assert (TREE_CODE (t) == CALL_EXPR); member = CALL_EXPR_ARG (t, 0); /* We don't use build_cplus_new here because it complains about abstract bases. Leaving the call unwrapped means that it has the wrong type, but cxx_eval_constant_expression doesn't care. */ init = unshare_expr (t); } + else if (TREE_CODE (t) == DECL_EXPR) + /* Declaring a temporary, don't add it to the CONSTRUCTOR. */ + return true; + else + gcc_unreachable (); if (TREE_CODE (member) == INDIRECT_REF) member = TREE_OPERAND (member, 0); if (TREE_CODE (member) == NOP_EXPR) diff --git a/gcc-4.7/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C b/gcc-4.7/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C new file mode 100644 index 000000000..4b526eaa7 --- /dev/null +++ b/gcc-4.7/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C @@ -0,0 +1,16 @@ +// PR c++/55856 +// { dg-options -std=c++11 } + +struct A +{ + A(const char *); +}; + +template <class T> +struct B +{ + T t; + template <class U> constexpr B(U&& u): t(u) { }; +}; + +B<A&&> b(""); |