diff mbox series

[1/5] gdb/coffread: bring separate debug file logic into line with elfread.c

Message ID c5b247d77d16563fc28d3db07a5cd2843bf29d50.1697626088.git.aburgess@redhat.com
State New
Headers
Series New Python hook for missing debug information |

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-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm fail Testing failed

Commit Message

Andrew Burgess Oct. 18, 2023, 10:53 a.m. UTC 
  In this commit:

  commit 8a92335bfca80cc9b4cd217505ea0dcbfdefbf07
  Date:   Fri Feb 1 19:39:04 2013 +0000

the logic for when we try to load a separate debug file in elfread.c
was extended.  The new code checks that the objfile doesn't already
have a separate debug objfile linked to it, and that the objfile isn't
itself a separate debug objfile for some other objfile.

The coffread code wasn't extended at the same time.

I don't know if it's possible for the coffread code to get into the
same state where these checks are needed, but I don't see why having
these checks would be a problem.  In a later commit I plan to merge
this part of the elfread and coffread code, so bringing these two
pieces of code into line first makes that job easier.

I haven't tested this, I don't have a coff target to hand.
---
 gdb/coffread.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Tom Tromey Oct. 20, 2023, 5:35 p.m. UTC | #1 
>>>>> "Andrew" == Andrew Burgess <aburgess@redhat.com> writes:

Andrew> I haven't tested this, I don't have a coff target to hand.

I suspect you can do a smoke test by building a "hello world" with the
the mingw toolchain shipped in Fedora.  IIRC this goes through
coff_symfile_read.

The suspected-to-be-dead part of coffread is coffstab_build_psymtabs.

Tom
Andrew Burgess Oct. 24, 2023, 11:59 a.m. UTC | #2 
Tom Tromey <tom@tromey.com> writes:

>>>>>> "Andrew" == Andrew Burgess <aburgess@redhat.com> writes:
>
> Andrew> I haven't tested this, I don't have a coff target to hand.
>
> I suspect you can do a smoke test by building a "hello world" with the
> the mingw toolchain shipped in Fedora.  IIRC this goes through
> coff_symfile_read.

Yes it does.  I've given this a try and I still see the debug
information being loaded so I've updated the commit message to indicate
that minimal testing has been done.

> The suspected-to-be-dead part of coffread is coffstab_build_psymtabs.

I didn't understand this part.

Thanks,
Andrew

---

commit 3ea19ccbd59c20d5534c9331c10766eb707ce81d
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Thu Oct 12 19:42:19 2023 +0100

    gdb/coffread: bring separate debug file logic into line with elfread.c
    
    In this commit:
    
      commit 8a92335bfca80cc9b4cd217505ea0dcbfdefbf07
      Date:   Fri Feb 1 19:39:04 2013 +0000
    
    the logic for when we try to load a separate debug file in elfread.c
    was extended.  The new code checks that the objfile doesn't already
    have a separate debug objfile linked to it, and that the objfile isn't
    itself a separate debug objfile for some other objfile.
    
    The coffread code wasn't extended at the same time.
    
    I don't know if it's possible for the coffread code to get into the
    same state where these checks are needed, but I don't see why having
    these checks would be a problem.  In a later commit I plan to merge
    this part of the elfread and coffread code, so bringing these two
    pieces of code into line first makes that job easier.
    
    I've tested this with a simple test binary compiled with the mingw
    toolchain on a Linux host.  After compiling the binary and splitting
    out the debug info GDB still finds and loads the separate debug info.

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 4a6a83b15ad..e1415d6b258 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -725,7 +725,9 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
     }
 
   /* Try to add separate debug file if no symbols table found.   */
-  if (!objfile->has_partial_symbols ())
+  else if (!objfile->has_partial_symbols ()
+	   && objfile->separate_debug_objfile == NULL
+	   && objfile->separate_debug_objfile_backlink == NULL)
     {
       deferred_warnings warnings;
       std::string debugfile
diff mbox series

Patch

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 4a6a83b15ad..e1415d6b258 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -725,7 +725,9 @@  coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
     }
 
   /* Try to add separate debug file if no symbols table found.   */
-  if (!objfile->has_partial_symbols ())
+  else if (!objfile->has_partial_symbols ()
+	   && objfile->separate_debug_objfile == NULL
+	   && objfile->separate_debug_objfile_backlink == NULL)
     {
       deferred_warnings warnings;
       std::string debugfile