aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2019-12-30 16:07:33 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2019-12-30 16:07:33 +0000
commita5650762680ea88c789906de91ded06ee48e1e67 (patch)
tree33f39687b65b22c03f7cd1dba3cdcce56905ce54
parent04e4997a567142f56dc83eba67b9590c0431d7da (diff)
downloadgcc-a5650762680ea88c789906de91ded06ee48e1e67.zip
gcc-a5650762680ea88c789906de91ded06ee48e1e67.tar.gz
gcc-a5650762680ea88c789906de91ded06ee48e1e67.tar.bz2
Remove assert in reshape_init_r.
Asserting !BRACE_ENCLOSED_INITIALIZER_P seems pretty pointless, since that checks for init_list_type_node, and a compound literal won't have that type, nor will we see that type if we just checked that it's something else. * decl.c (reshape_init_r): Remove assert. From-SVN: r279771
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/decl.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9c30253..a237a8f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-30 Marek Polacek <polacek@redhat.com>
+
+ * decl.c (reshape_init_r): Remove assert.
+
2019-12-30 Paolo Carlini <paolo.carlini@oracle.com>
* decl2.c (delete_sanity): Add location_t parameter and use
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2760dba..afe2aac 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6408,7 +6408,6 @@ reshape_init_r (tree type, reshape_iter *d, bool first_initializer_p,
else if (same_type_ignoring_top_level_qualifiers_p (type, init_type))
{
++d->cur;
- gcc_assert (!BRACE_ENCLOSED_INITIALIZER_P (stripped_init));
return init;
}
else