Re: [PATCH][gdb] Fix cc-with-dwz regression

[Tom de Vries <tdevries@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 882 bytes --]

On 20-02-2020 17:43, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
> 
> Tom> Hi,
> Tom> I noticed a regression with board cc-with-dwz:
> Tom> ...
> Tom> FAIL: gdb.cp/m-static.exp: static const int initialized elsewhere
> Tom> FAIL: gdb.cp/m-static.exp: info variable everywhere
> Tom> ...
> 
> Tom> The problem started with commit 0494dbecdf "Consolidate partial symtab
> Tom> dependency reading".
> 
> Thank you for doing this.
> 
> Tom> The commit replaces the dwarf2_psymtab::expand_psymtab specific reading of
> Tom> dependencies, which contains a "dependencies[i]->user == NULL" test, with a
> Tom> generic partial_symtab::read_dependencies call, which does not test the user
> Tom> field.
> 
> Can we simply add this to the base class?
> I think only the DWARF reader ever sets the "user" field anyway.

Ack, updated.

OK like this?

Thanks,
- Tom

[-- Attachment #2: 0001-gdb-Fix-cc-with-dwz-regression.patch --]
[-- Type: text/x-patch, Size: 1580 bytes --]

[gdb] Fix cc-with-dwz regression

I noticed a regression with board cc-with-dwz:
...
FAIL: gdb.cp/m-static.exp: static const int initialized elsewhere
FAIL: gdb.cp/m-static.exp: info variable everywhere
...

The problem started with commit 0494dbecdf "Consolidate partial symtab
dependency reading".

The commit replaces the dwarf2_psymtab::expand_psymtab specific reading of
dependencies, which contains a "dependencies[i]->user == NULL" test, with a
generic partial_symtab::read_dependencies call, which does not test the user
field.

This patch fixes the regression by adding back the test, in the generic
partial_symtab::read_dependencies.

Build and reg-tested on x86_64-linux.

Tested natively, as well as with boards cc-with-dwz and cc-with-dwz-m.

The patch fixes all 33 regressions with cc-with-dwz, and all 2929 regression
with cc-with-dwz-m.

gdb/ChangeLog:

2020-02-21  Tom de Vries  <tdevries@suse.de>

	PR gdb/25534
	* psymtab.c (partial_symtab::read_dependencies): Don't read dependency
	if dependencies[i]->user != NULL.

---
 gdb/psymtab.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 56576b3bce..fd7fc8feff 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1688,7 +1688,8 @@ partial_symtab::read_dependencies (struct objfile *objfile)
 {
   for (int i = 0; i < number_of_dependencies; ++i)
     {
-      if (!dependencies[i]->readin_p ())
+      if (!dependencies[i]->readin_p ()
+	  && dependencies[i]->user == NULL)
 	{
 	  /* Inform about additional files to be read in.  */
 	  if (info_verbose)