diff options
| author | Jason Merrill <jason@redhat.com> | 2011-04-26 19:42:50 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-04-26 19:42:50 -0400 |
| commit | 10d1b83126f0c20a4a67b555bcd802926a08b08b (patch) | |
| tree | b36c539a36882c563902d0fc965fef66f6dcb683 /gcc/cp/decl.c | |
| parent | ab175bfcc65503b6ec319a65c00deb2379ae9e14 (diff) | |
| download | gcc-10d1b83126f0c20a4a67b555bcd802926a08b08b.tar.gz | |
re PR c++/48726 ([C++0x] [4.6 Regression] ICE with initializer_list of unique_ptr)
PR c++/48726
* call.c (convert_like_real): Correct TREE_CONSTANT on CONSTRUCTOR.
* decl.c (reshape_init_array_1): Likewise.
From-SVN: r172993
Diffstat (limited to 'gcc/cp/decl.c')
| -rw-r--r-- | gcc/cp/decl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 61b57ea1a8a..6f8bb9f815b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4904,6 +4904,8 @@ reshape_init_array_1 (tree elt_type, tree max_index, reshape_iter *d) return error_mark_node; CONSTRUCTOR_APPEND_ELT (CONSTRUCTOR_ELTS (new_init), size_int (index), elt_init); + if (!TREE_CONSTANT (elt_init)) + TREE_CONSTANT (new_init) = false; } return new_init; |