https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103847

--- Comment #10 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <ja...@gcc.gnu.org>:

https://gcc.gnu.org/g:7918d8270a43e42b0cba902ec17ce87b6a3c74a9

commit r12-6163-g7918d8270a43e42b0cba902ec17ce87b6a3c74a9
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Sat Jan 1 06:30:39 2022 +0100

    testsuite: Adjust gcc.misc-tests/godump-1.c testcase

    On Wed, Dec 29, 2021 at 03:54:03PM -0800, Ian Lance Taylor via Gcc-patches
wrote:
    > PR go/103847
    > * godump.c (go_force_record_alignment): Name the alignment
    > field "_".

    > --- a/gcc/godump.c
    > +++ b/gcc/godump.c
    > @@ -651,7 +651,7 @@ go_force_record_alignment (struct obstack *ob, const
char *type_string,
    >                          unsigned int index, const char *error_string)
    >  {
    >    index = go_append_artificial_name (ob, index);
    > -  obstack_grow (ob, "_align ", 7);
    > +  obstack_grow (ob, "_ ", 2);
    >    if (type_string == NULL)
    >      obstack_grow (ob, error_string, strlen (error_string));
    >    else

    This change caused
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _ts_nested struct { u
struct { s int16; Godump_0_pad \\\\[2\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _ts_nested2 struct { u
struct { Godump_0_pad \\\\[4\\\\]byte; Godump_1_pad \\\\[2\\\\]byte; s int16; c
int8; Godump_2_pad
    +\\\\[1\\\\]byte; Godump_3_pad \\\\[2\\\\]byte; Godump_4_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_gaps struct {
bf1 uint8; c uint8; bf2 uint8; Godump_0_pad \\\\[2\\\\]byte; s uint16;
Godump_1_align \\\\[0\\\\]int32; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_pad16_1 struct {
Godump_0_pad \\\\[1\\\\]byte; c uint8; Godump_1_align \\\\[0\\\\]int16; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_pad16_2 struct {
Godump_0_pad \\\\[2\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int16; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_pad32_1 struct {
Godump_0_pad \\\\[1\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int32; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_pad32_2 struct {
Godump_0_pad \\\\[4\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int32; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_pad64_1 struct {
Godump_0_pad \\\\[1\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsbf_pad64_2 struct {
Godump_0_pad \\\\[8\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsn_anon struct { a
uint8; s uint16; b uint8; Godump_0_pad \\\\[.\\\\]byte; Godump_1_align
\\\\[0\\\\]int16; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tsu_anon struct { c
uint8; Godump_0_pad \\\\[7\\\\]byte; Godump_1_align \\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tu1 struct { c uint8;
Godump_0_pad \\\\[.\\\\]byte; Godump_1_align \\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tu3_size struct { ca
\\\\[4\\\\+1\\\\]uint8; Godump_0_pad \\\\[.\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tu_nested struct { u
struct { s int16; Godump_0_pad \\\\[2\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tu_nested2 struct { u
struct { Godump_0_pad \\\\[4\\\\]byte; Godump_1_pad \\\\[2\\\\]byte; s int16; c
int8; Godump_2_pad
    +\\\\[1\\\\]byte; Godump_3_pad \\\\[2\\\\]byte; Godump_4_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^type _tu_size struct { ca
\\\\[4\\\\+1\\\\]uint8; Godump_0_pad \\\\[.\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _s_nested struct { u
struct { s int16; Godump_0_pad \\\\[2\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _s_nested2 struct { u
struct { Godump_0_pad \\\\[4\\\\]byte; Godump_1_pad \\\\[2\\\\]byte; s int16; c
int8; Godump_2_pad
    +\\\\[1\\\\]byte; Godump_3_pad \\\\[2\\\\]byte; Godump_4_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_gaps struct { bf1
uint8; c uint8; bf2 uint8; Godump_0_pad \\\\[2\\\\]byte; s uint16;
Godump_1_align \\\\[0\\\\]int32; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_pad16_1 struct {
Godump_0_pad \\\\[1\\\\]byte; c uint8; Godump_1_align \\\\[0\\\\]int16; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_pad16_2 struct {
Godump_0_pad \\\\[2\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int16; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_pad32_1 struct {
Godump_0_pad \\\\[1\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int32; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_pad32_2 struct {
Godump_0_pad \\\\[4\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int32; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_pad64_1 struct {
Godump_0_pad \\\\[1\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sbf_pad64_2 struct {
Godump_0_pad \\\\[8\\\\]byte; c uint8; Godump_1_pad \\\\[.\\\\]byte;
Godump_2_align \\\\[0\\\\]int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _sn_anon struct { a
uint8; s uint16; b uint8; Godump_0_pad \\\\[.\\\\]byte; Godump_1_align
\\\\[0\\\\]int16; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _su_anon struct { c
uint8; Godump_0_pad \\\\[7\\\\]byte; Godump_1_align \\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _u1 struct { c uint8;
Godump_0_pad \\\\[.\\\\]byte; Godump_1_align \\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _u3_size struct { ca
\\\\[4\\\\+1\\\\]uint8; Godump_0_pad \\\\[.\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int64; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _u_nested struct { u
struct { s int16; Godump_0_pad \\\\[2\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _u_nested2 struct { u
struct { Godump_0_pad \\\\[4\\\\]byte; Godump_1_pad \\\\[2\\\\]byte; s int16; c
int8; Godump_2_pad
    +\\\\[1\\\\]byte; Godump_3_pad \\\\[2\\\\]byte; Godump_4_align
\\\\[0\\\\]u?int32; }; }\$
    +FAIL: gcc.misc-tests/godump-1.c scan-file (?n)^var _u_size struct { ca
\\\\[4\\\\+1\\\\]uint8; Godump_0_pad \\\\[.\\\\]byte; Godump_1_align
\\\\[0\\\\]u?int64; }\$
    on x86_64-linux.

    The following patch adjusts the testcase for the above change.

    2022-01-01  Jakub Jelinek  <ja...@redhat.com>

            * gcc.misc-tests/godump-1.c: Adjust for renaming of last
            field from _align suffix to _ suffix.

Reply via email to