From fca7c76481e49777e46e2954a310dc40b4838d21 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 22 Nov 2016 23:25:07 +0000 Subject: [PATCH] re PR go/78431 (ICE in go_append_padding, at godump.c:636) PR go/78431 PR go/78432 * godump.c (go_format_type): Always pass alignment as 1 when calling go_append_padding at end of struct/union. From-SVN: r242728 --- gcc/ChangeLog | 7 +++++++ gcc/godump.c | 11 +++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c47ebd4bebf..6bc37d3d52c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-11-22 Ian Lance Taylor + + PR go/78431 + PR go/78432 + * godump.c (go_format_type): Always pass alignment as 1 when + calling go_append_padding at end of struct/union. + 2016-11-22 Jakub Jelinek PR target/78451 diff --git a/gcc/godump.c b/gcc/godump.c index 608542c63d9..1e9a07e0ce9 100644 --- a/gcc/godump.c +++ b/gcc/godump.c @@ -1006,14 +1006,9 @@ go_format_type (struct godump_container *container, tree type, } } /* Padding. */ - { - unsigned int align_unit; - - align_unit = (is_anon_record_or_union) ? 1 : TYPE_ALIGN_UNIT (type); - *p_art_i = go_append_padding - (ob, prev_field_end, TREE_INT_CST_LOW (TYPE_SIZE_UNIT (type)), - align_unit, *p_art_i, &prev_field_end); - } + *p_art_i = go_append_padding (ob, prev_field_end, + TREE_INT_CST_LOW (TYPE_SIZE_UNIT (type)), + 1, *p_art_i, &prev_field_end); /* Alignment. */ if (!is_anon_record_or_union && known_alignment < TYPE_ALIGN_UNIT (type)) -- 2.30.2