diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-02-21 16:36:48 +0100 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-02-21 16:36:48 +0100 |
| commit | 1eb731795357d77ac1f6200edd04f86d210bec79 (patch) | |
| tree | 98a17df74bcc582d1ce015644bf5ba83c235e320 /gdb/psymtab.c | |
| parent | bd360d3048e80234a8e772573c9ca3cac9c0466b (diff) | |
| download | gdb-1eb731795357d77ac1f6200edd04f86d210bec79.zip gdb-1eb731795357d77ac1f6200edd04f86d210bec79.tar.gz gdb-1eb731795357d77ac1f6200edd04f86d210bec79.tar.bz2 | |
[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.
Diffstat (limited to 'gdb/psymtab.c')
| -rw-r--r-- | gdb/psymtab.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 56576b3..fd7fc8f 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) |