diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-05-27 11:13:59 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-05-27 11:15:56 -0400 |
| commit | 64874a40306f556c290c8829f42526443db0f9e9 (patch) | |
| tree | 9abf010f6792d431c14713c6d07fab342c9684ba | |
| parent | 4ab09049d65fbda8637400bde3d39761ae512404 (diff) | |
| download | gdb-64874a40306f556c290c8829f42526443db0f9e9.zip gdb-64874a40306f556c290c8829f42526443db0f9e9.tar.gz gdb-64874a40306f556c290c8829f42526443db0f9e9.tar.bz2 | |
Remove reference to dwarf2_per_cu_data::dwarf2_per_objfile in queue_and_load_all_dwo_tus
In this context, we know that per_cu->cu will be set, as there is this
assertion:
gdb_assert (per_cu->cu != NULL)
So in order to remove the dwarf2_per_cu_data::dwarf2_per_objfile
reference in queue_and_load_all_dwo_tus, we can go through per_cu->cu.
This adds a reference to dwarf2_per_cu_data::cu, but it will get removed
eventually, in a subsequent patch.
gdb/ChangeLog:
* dwarf2/read.c (queue_and_load_all_dwo_tus): Access per_objfile
data through per_cu->cu.
Change-Id: Id4662828ac3c5bc93fe221df3c9bd9a36a8427ad
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9a0d68b..7ab7f6c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-05-27 Simon Marchi <simon.marchi@efficios.com> + * dwarf2/read.c (queue_and_load_all_dwo_tus): Access per_objfile + data through per_cu->cu. + +2020-05-27 Simon Marchi <simon.marchi@efficios.com> + * dwarf2/read.c (lookup_dwo_comp_unit): Change dwarf2_per_cu_data parameter fo dwarf2_cu. (lookup_dwo_type_unit): Likewise. diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 5e3ab37..4b63b8e 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -12870,8 +12870,8 @@ queue_and_load_all_dwo_tus (struct dwarf2_per_cu_data *per_cu) struct dwo_file *dwo_file; gdb_assert (!per_cu->is_debug_types); - gdb_assert (get_dwp_file (per_cu->dwarf2_per_objfile) == NULL); gdb_assert (per_cu->cu != NULL); + gdb_assert (get_dwp_file (per_cu->cu->per_objfile) == NULL); dwo_unit = per_cu->cu->dwo_unit; gdb_assert (dwo_unit != NULL); |