[01/11,gdb/testsuite] Add gdb.base/fission-macro.exp

Message ID 20240521154415.9543-1-tdevries@suse.de
State Committed
Headers
Series [01/11,gdb/testsuite] Add gdb.base/fission-macro.exp |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed

Commit Message

Tom de Vries May 21, 2024, 3:44 p.m. UTC
  Starting with gcc commit 80048aa13a6 ("debug/111409 - don't generate COMDAT
macro sections for split DWARF"), available from release gcc 14.1 onwards, gcc
produces a usable dwarf-5 32-bit .debug_macro.dwo section.

Add a test-case excercising this.

Tested on x86_64-linux.

Tested test-case using a current gcc trunk build, and gcc 14.
---
 gdb/testsuite/gdb.base/fission-macro-2.c | 27 +++++++++
 gdb/testsuite/gdb.base/fission-macro.c   | 27 +++++++++
 gdb/testsuite/gdb.base/fission-macro.exp | 75 ++++++++++++++++++++++++
 3 files changed, 129 insertions(+)
 create mode 100644 gdb/testsuite/gdb.base/fission-macro-2.c
 create mode 100644 gdb/testsuite/gdb.base/fission-macro.c
 create mode 100644 gdb/testsuite/gdb.base/fission-macro.exp


base-commit: 05887e360ad3db3265e3dc2f7a845660d1d3c02f
  

Comments

Tom de Vries June 13, 2024, 3:40 p.m. UTC | #1
On 5/21/24 17:44, Tom de Vries wrote:
> Starting with gcc commit 80048aa13a6 ("debug/111409 - don't generate COMDAT
> macro sections for split DWARF"), available from release gcc 14.1 onwards, gcc
> produces a usable dwarf-5 32-bit .debug_macro.dwo section.
> 
> Add a test-case excercising this.
> 

I went ahead and pushed this patch, since it only adds a test-case.

Thanks,
- Tom

> Tested on x86_64-linux.
> 
> Tested test-case using a current gcc trunk build, and gcc 14.
> ---
>   gdb/testsuite/gdb.base/fission-macro-2.c | 27 +++++++++
>   gdb/testsuite/gdb.base/fission-macro.c   | 27 +++++++++
>   gdb/testsuite/gdb.base/fission-macro.exp | 75 ++++++++++++++++++++++++
>   3 files changed, 129 insertions(+)
>   create mode 100644 gdb/testsuite/gdb.base/fission-macro-2.c
>   create mode 100644 gdb/testsuite/gdb.base/fission-macro.c
>   create mode 100644 gdb/testsuite/gdb.base/fission-macro.exp
> 
> diff --git a/gdb/testsuite/gdb.base/fission-macro-2.c b/gdb/testsuite/gdb.base/fission-macro-2.c
> new file mode 100644
> index 00000000000..fb088c8bfaf
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/fission-macro-2.c
> @@ -0,0 +1,27 @@
> +/* This testcase is part of GDB, the GNU debugger.
> +
> +   Copyright 2024 Free Software Foundation, Inc.
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +#define THIRD 3
> +#define FOURTH 4
> +
> +extern int foo (void);
> +
> +int
> +foo (void)
> +{
> +  return 0;
> +}
> diff --git a/gdb/testsuite/gdb.base/fission-macro.c b/gdb/testsuite/gdb.base/fission-macro.c
> new file mode 100644
> index 00000000000..9c8cbece5c5
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/fission-macro.c
> @@ -0,0 +1,27 @@
> +/* This testcase is part of GDB, the GNU debugger.
> +
> +   Copyright 2024 Free Software Foundation, Inc.
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +#define FIRST 1
> +#define SECOND 2
> +
> +extern int foo (void);
> +
> +int
> +main (void)
> +{
> +  return foo ();
> +}
> diff --git a/gdb/testsuite/gdb.base/fission-macro.exp b/gdb/testsuite/gdb.base/fission-macro.exp
> new file mode 100644
> index 00000000000..705e3dd0c4b
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/fission-macro.exp
> @@ -0,0 +1,75 @@
> +# Copyright 2024 Free Software Foundation, Inc.
> +
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +# Gcc 14 is the first release containing the fix for PR debug/111409.
> +require {expr [gcc_major_version] >= 14}
> +
> +standard_testfile .c -2.c
> +
> +proc do_tests { dwarf_version dwarf_bits strict_dwarf } {
> +    set opts {}
> +    lappend opts debug
> +    lappend opts quiet
> +    lappend opts additional_flags=-gsplit-dwarf
> +    lappend opts macros
> +
> +    if { $dwarf_bits == 64 } {
> +	lappend opts additional_flags=-gdwarf64
> +    }
> +
> +    if { $strict_dwarf } {
> +	lappend opts additional_flags=-gstrict-dwarf
> +    }
> +
> +    lappend opts additional_flags=-gdwarf-$dwarf_version
> +
> +    set id v$dwarf_version-b$dwarf_bits-s$strict_dwarf
> +
> +    set srcfiles [list $::srcfile $::srcfile2]
> +    if { [build_executable "failed to prepare" $::testfile-$id $srcfiles $opts] } {
> +	return -1
> +    }
> +
> +    clean_restart
> +
> +    gdb_load_no_complaints $::binfile-$id
> +
> +    if {![runto_main]} {
> +	return 0
> +    }
> +
> +    gdb_test "p FIRST" " = 1"
> +    gdb_test "p SECOND" " = 2"
> +
> +    gdb_test "info macro FIRST" "#define FIRST 1"
> +    gdb_test "info macro SECOND" "#define SECOND 2"
> +
> +    gdb_breakpoint foo
> +    gdb_continue_to_breakpoint "foo"
> +
> +    gdb_test "p THIRD" " = 3"
> +    gdb_test "p FOURTH" " = 4"
> +
> +    gdb_test "info macro THIRD" "#define THIRD 3"
> +    gdb_test "info macro FOURTH" "#define FOURTH 4"
> +}
> +
> +foreach_with_prefix dwarf_version {5} {
> +    foreach_with_prefix dwarf_bits {32} {
> +	foreach_with_prefix strict_dwarf {0 1} {
> +	    do_tests $dwarf_version $dwarf_bits $strict_dwarf
> +	}
> +    }
> +}
> 
> base-commit: 05887e360ad3db3265e3dc2f7a845660d1d3c02f
  
Christophe Lyon June 17, 2024, 8:16 a.m. UTC | #2
Hi Tom,

On Thu, 13 Jun 2024 at 17:40, Tom de Vries <tdevries@suse.de> wrote:
>
> On 5/21/24 17:44, Tom de Vries wrote:
> > Starting with gcc commit 80048aa13a6 ("debug/111409 - don't generate COMDAT
> > macro sections for split DWARF"), available from release gcc 14.1 onwards, gcc
> > produces a usable dwarf-5 32-bit .debug_macro.dwo section.
> >
> > Add a test-case excercising this.
> >
>
> I went ahead and pushed this patch, since it only adds a test-case.
>

As you may have noticed, this patch was flagged by our CI on arm:
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=0: info macro FIRST
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=0: info macro FOURTH
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=0: info macro SECOND
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=0: info macro THIRD
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=1: info macro FIRST
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=1: info macro FOURTH
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=1: info macro SECOND
FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
strict_dwarf=1: info macro THIRD


From gdb.log I can see:
info macro FIRST
Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro.c:0
-DFIRST=1
(gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
dwarf_bits=32: strict_dwarf=0: info macro FIRST
info macro SECOND
Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro.c:0
-DSECOND=2
(gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
dwarf_bits=32: strict_dwarf=0: info macro SECOND

info macro THIRD
Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro-2.c:0
-DTHIRD=3
(gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
dwarf_bits=32: strict_dwarf=0: info macro THIRD
info macro FOURTH
Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro-2.c:0
-DFOURTH=4
(gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
dwarf_bits=32: strict_dwarf=0: info macro FOURTH


I've also noticed:
get_compiler_info: gcc-15-0-0

(which is expected, this CI loop is using trunk GCC)

Does this help?

Thanks,

Christophe

> Thanks,
> - Tom
>
> > Tested on x86_64-linux.
> >
> > Tested test-case using a current gcc trunk build, and gcc 14.
> > ---
> >   gdb/testsuite/gdb.base/fission-macro-2.c | 27 +++++++++
> >   gdb/testsuite/gdb.base/fission-macro.c   | 27 +++++++++
> >   gdb/testsuite/gdb.base/fission-macro.exp | 75 ++++++++++++++++++++++++
> >   3 files changed, 129 insertions(+)
> >   create mode 100644 gdb/testsuite/gdb.base/fission-macro-2.c
> >   create mode 100644 gdb/testsuite/gdb.base/fission-macro.c
> >   create mode 100644 gdb/testsuite/gdb.base/fission-macro.exp
> >
> > diff --git a/gdb/testsuite/gdb.base/fission-macro-2.c b/gdb/testsuite/gdb.base/fission-macro-2.c
> > new file mode 100644
> > index 00000000000..fb088c8bfaf
> > --- /dev/null
> > +++ b/gdb/testsuite/gdb.base/fission-macro-2.c
> > @@ -0,0 +1,27 @@
> > +/* This testcase is part of GDB, the GNU debugger.
> > +
> > +   Copyright 2024 Free Software Foundation, Inc.
> > +
> > +   This program is free software; you can redistribute it and/or modify
> > +   it under the terms of the GNU General Public License as published by
> > +   the Free Software Foundation; either version 3 of the License, or
> > +   (at your option) any later version.
> > +
> > +   This program is distributed in the hope that it will be useful,
> > +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +   GNU General Public License for more details.
> > +
> > +   You should have received a copy of the GNU General Public License
> > +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> > +
> > +#define THIRD 3
> > +#define FOURTH 4
> > +
> > +extern int foo (void);
> > +
> > +int
> > +foo (void)
> > +{
> > +  return 0;
> > +}
> > diff --git a/gdb/testsuite/gdb.base/fission-macro.c b/gdb/testsuite/gdb.base/fission-macro.c
> > new file mode 100644
> > index 00000000000..9c8cbece5c5
> > --- /dev/null
> > +++ b/gdb/testsuite/gdb.base/fission-macro.c
> > @@ -0,0 +1,27 @@
> > +/* This testcase is part of GDB, the GNU debugger.
> > +
> > +   Copyright 2024 Free Software Foundation, Inc.
> > +
> > +   This program is free software; you can redistribute it and/or modify
> > +   it under the terms of the GNU General Public License as published by
> > +   the Free Software Foundation; either version 3 of the License, or
> > +   (at your option) any later version.
> > +
> > +   This program is distributed in the hope that it will be useful,
> > +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +   GNU General Public License for more details.
> > +
> > +   You should have received a copy of the GNU General Public License
> > +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> > +
> > +#define FIRST 1
> > +#define SECOND 2
> > +
> > +extern int foo (void);
> > +
> > +int
> > +main (void)
> > +{
> > +  return foo ();
> > +}
> > diff --git a/gdb/testsuite/gdb.base/fission-macro.exp b/gdb/testsuite/gdb.base/fission-macro.exp
> > new file mode 100644
> > index 00000000000..705e3dd0c4b
> > --- /dev/null
> > +++ b/gdb/testsuite/gdb.base/fission-macro.exp
> > @@ -0,0 +1,75 @@
> > +# Copyright 2024 Free Software Foundation, Inc.
> > +
> > +# This program is free software; you can redistribute it and/or modify
> > +# it under the terms of the GNU General Public License as published by
> > +# the Free Software Foundation; either version 3 of the License, or
> > +# (at your option) any later version.
> > +#
> > +# This program is distributed in the hope that it will be useful,
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +# GNU General Public License for more details.
> > +#
> > +# You should have received a copy of the GNU General Public License
> > +# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> > +
> > +# Gcc 14 is the first release containing the fix for PR debug/111409.
> > +require {expr [gcc_major_version] >= 14}
> > +
> > +standard_testfile .c -2.c
> > +
> > +proc do_tests { dwarf_version dwarf_bits strict_dwarf } {
> > +    set opts {}
> > +    lappend opts debug
> > +    lappend opts quiet
> > +    lappend opts additional_flags=-gsplit-dwarf
> > +    lappend opts macros
> > +
> > +    if { $dwarf_bits == 64 } {
> > +     lappend opts additional_flags=-gdwarf64
> > +    }
> > +
> > +    if { $strict_dwarf } {
> > +     lappend opts additional_flags=-gstrict-dwarf
> > +    }
> > +
> > +    lappend opts additional_flags=-gdwarf-$dwarf_version
> > +
> > +    set id v$dwarf_version-b$dwarf_bits-s$strict_dwarf
> > +
> > +    set srcfiles [list $::srcfile $::srcfile2]
> > +    if { [build_executable "failed to prepare" $::testfile-$id $srcfiles $opts] } {
> > +     return -1
> > +    }
> > +
> > +    clean_restart
> > +
> > +    gdb_load_no_complaints $::binfile-$id
> > +
> > +    if {![runto_main]} {
> > +     return 0
> > +    }
> > +
> > +    gdb_test "p FIRST" " = 1"
> > +    gdb_test "p SECOND" " = 2"
> > +
> > +    gdb_test "info macro FIRST" "#define FIRST 1"
> > +    gdb_test "info macro SECOND" "#define SECOND 2"
> > +
> > +    gdb_breakpoint foo
> > +    gdb_continue_to_breakpoint "foo"
> > +
> > +    gdb_test "p THIRD" " = 3"
> > +    gdb_test "p FOURTH" " = 4"
> > +
> > +    gdb_test "info macro THIRD" "#define THIRD 3"
> > +    gdb_test "info macro FOURTH" "#define FOURTH 4"
> > +}
> > +
> > +foreach_with_prefix dwarf_version {5} {
> > +    foreach_with_prefix dwarf_bits {32} {
> > +     foreach_with_prefix strict_dwarf {0 1} {
> > +         do_tests $dwarf_version $dwarf_bits $strict_dwarf
> > +     }
> > +    }
> > +}
> >
> > base-commit: 05887e360ad3db3265e3dc2f7a845660d1d3c02f
>
  
Tom de Vries June 17, 2024, 8:23 a.m. UTC | #3
On 6/17/24 10:16, Christophe Lyon wrote:
> Hi Tom,
> 
> On Thu, 13 Jun 2024 at 17:40, Tom de Vries <tdevries@suse.de> wrote:
>>
>> On 5/21/24 17:44, Tom de Vries wrote:
>>> Starting with gcc commit 80048aa13a6 ("debug/111409 - don't generate COMDAT
>>> macro sections for split DWARF"), available from release gcc 14.1 onwards, gcc
>>> produces a usable dwarf-5 32-bit .debug_macro.dwo section.
>>>
>>> Add a test-case excercising this.
>>>
>>
>> I went ahead and pushed this patch, since it only adds a test-case.
>>
> 
> As you may have noticed, this patch was flagged by our CI on arm:
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=0: info macro FIRST
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=0: info macro FOURTH
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=0: info macro SECOND
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=0: info macro THIRD
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=1: info macro FIRST
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=1: info macro FOURTH
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=1: info macro SECOND
> FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> strict_dwarf=1: info macro THIRD
> 
> 
>  From gdb.log I can see:
> info macro FIRST
> Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro.c:0
> -DFIRST=1
> (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> dwarf_bits=32: strict_dwarf=0: info macro FIRST
> info macro SECOND
> Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro.c:0
> -DSECOND=2
> (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> dwarf_bits=32: strict_dwarf=0: info macro SECOND
> 
> info macro THIRD
> Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro-2.c:0
> -DTHIRD=3
> (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> dwarf_bits=32: strict_dwarf=0: info macro THIRD
> info macro FOURTH
> Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro-2.c:0
> -DFOURTH=4
> (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> dwarf_bits=32: strict_dwarf=0: info macro FOURTH
> 
> 
> I've also noticed:
> get_compiler_info: gcc-15-0-0
> 
> (which is expected, this CI loop is using trunk GCC)
> 
> Does this help?

Hi Christophe,

Thanks for the info.

Indeed I already noticed it, and filed this PR ( 
https://sourceware.org/bugzilla/show_bug.cgi?id=31897 ) to track it.

I managed to reproduce it, and AFAICT it's fixed by the following patch 
in the patch series (something I didn't realize when committing, because 
this FAIL occurs only on 32-bit targets).

Sorry for the noise.

Thanks,
- Tom
  
Christophe Lyon June 17, 2024, 8:43 a.m. UTC | #4
On Mon, 17 Jun 2024 at 10:22, Tom de Vries <tdevries@suse.de> wrote:
>
> On 6/17/24 10:16, Christophe Lyon wrote:
> > Hi Tom,
> >
> > On Thu, 13 Jun 2024 at 17:40, Tom de Vries <tdevries@suse.de> wrote:
> >>
> >> On 5/21/24 17:44, Tom de Vries wrote:
> >>> Starting with gcc commit 80048aa13a6 ("debug/111409 - don't generate COMDAT
> >>> macro sections for split DWARF"), available from release gcc 14.1 onwards, gcc
> >>> produces a usable dwarf-5 32-bit .debug_macro.dwo section.
> >>>
> >>> Add a test-case excercising this.
> >>>
> >>
> >> I went ahead and pushed this patch, since it only adds a test-case.
> >>
> >
> > As you may have noticed, this patch was flagged by our CI on arm:
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=0: info macro FIRST
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=0: info macro FOURTH
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=0: info macro SECOND
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=0: info macro THIRD
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=1: info macro FIRST
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=1: info macro FOURTH
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=1: info macro SECOND
> > FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=32:
> > strict_dwarf=1: info macro THIRD
> >
> >
> >  From gdb.log I can see:
> > info macro FIRST
> > Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro.c:0
> > -DFIRST=1
> > (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> > dwarf_bits=32: strict_dwarf=0: info macro FIRST
> > info macro SECOND
> > Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro.c:0
> > -DSECOND=2
> > (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> > dwarf_bits=32: strict_dwarf=0: info macro SECOND
> >
> > info macro THIRD
> > Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro-2.c:0
> > -DTHIRD=3
> > (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> > dwarf_bits=32: strict_dwarf=0: info macro THIRD
> > info macro FOURTH
> > Defined at /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gdb.git~master/gdb/testsuite/gdb.base/fission-macro-2.c:0
> > -DFOURTH=4
> > (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5:
> > dwarf_bits=32: strict_dwarf=0: info macro FOURTH
> >
> >
> > I've also noticed:
> > get_compiler_info: gcc-15-0-0
> >
> > (which is expected, this CI loop is using trunk GCC)
> >
> > Does this help?
>
> Hi Christophe,
>
> Thanks for the info.
>
> Indeed I already noticed it, and filed this PR (
> https://sourceware.org/bugzilla/show_bug.cgi?id=31897 ) to track it.
>
> I managed to reproduce it, and AFAICT it's fixed by the following patch
> in the patch series (something I didn't realize when committing, because
> this FAIL occurs only on 32-bit targets).
>
> Sorry for the noise.
>

Thanks for the pointer, I had missed it.

Christophe

> Thanks,
> - Tom
  

Patch

diff --git a/gdb/testsuite/gdb.base/fission-macro-2.c b/gdb/testsuite/gdb.base/fission-macro-2.c
new file mode 100644
index 00000000000..fb088c8bfaf
--- /dev/null
+++ b/gdb/testsuite/gdb.base/fission-macro-2.c
@@ -0,0 +1,27 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2024 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#define THIRD 3
+#define FOURTH 4
+
+extern int foo (void);
+
+int
+foo (void)
+{
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/fission-macro.c b/gdb/testsuite/gdb.base/fission-macro.c
new file mode 100644
index 00000000000..9c8cbece5c5
--- /dev/null
+++ b/gdb/testsuite/gdb.base/fission-macro.c
@@ -0,0 +1,27 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2024 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#define FIRST 1
+#define SECOND 2
+
+extern int foo (void);
+
+int
+main (void)
+{
+  return foo ();
+}
diff --git a/gdb/testsuite/gdb.base/fission-macro.exp b/gdb/testsuite/gdb.base/fission-macro.exp
new file mode 100644
index 00000000000..705e3dd0c4b
--- /dev/null
+++ b/gdb/testsuite/gdb.base/fission-macro.exp
@@ -0,0 +1,75 @@ 
+# Copyright 2024 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+# Gcc 14 is the first release containing the fix for PR debug/111409.
+require {expr [gcc_major_version] >= 14}
+
+standard_testfile .c -2.c
+
+proc do_tests { dwarf_version dwarf_bits strict_dwarf } {
+    set opts {}
+    lappend opts debug
+    lappend opts quiet
+    lappend opts additional_flags=-gsplit-dwarf
+    lappend opts macros
+
+    if { $dwarf_bits == 64 } {
+	lappend opts additional_flags=-gdwarf64
+    }
+
+    if { $strict_dwarf } {
+	lappend opts additional_flags=-gstrict-dwarf
+    }
+
+    lappend opts additional_flags=-gdwarf-$dwarf_version
+
+    set id v$dwarf_version-b$dwarf_bits-s$strict_dwarf
+
+    set srcfiles [list $::srcfile $::srcfile2]
+    if { [build_executable "failed to prepare" $::testfile-$id $srcfiles $opts] } {
+	return -1
+    }
+
+    clean_restart
+
+    gdb_load_no_complaints $::binfile-$id
+
+    if {![runto_main]} {
+	return 0
+    }
+
+    gdb_test "p FIRST" " = 1"
+    gdb_test "p SECOND" " = 2"
+
+    gdb_test "info macro FIRST" "#define FIRST 1"
+    gdb_test "info macro SECOND" "#define SECOND 2"
+
+    gdb_breakpoint foo
+    gdb_continue_to_breakpoint "foo"
+
+    gdb_test "p THIRD" " = 3"
+    gdb_test "p FOURTH" " = 4"
+
+    gdb_test "info macro THIRD" "#define THIRD 3"
+    gdb_test "info macro FOURTH" "#define FOURTH 4"
+}
+
+foreach_with_prefix dwarf_version {5} {
+    foreach_with_prefix dwarf_bits {32} {
+	foreach_with_prefix strict_dwarf {0 1} {
+	    do_tests $dwarf_version $dwarf_bits $strict_dwarf
+	}
+    }
+}