diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2020-04-04 19:46:25 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-05-12 15:24:50 -0400 |
| commit | 4132873d03346d3237ea079c8586cbbd4006d540 (patch) | |
| tree | 67ebb0fca03fec731d2e948fac8c56d4482d1186 | |
| parent | 9fb9ca853da2381d997c4fa689f05da4c6f3a1de (diff) | |
| download | gdb-4132873d03346d3237ea079c8586cbbd4006d540.zip gdb-4132873d03346d3237ea079c8586cbbd4006d540.tar.gz gdb-4132873d03346d3237ea079c8586cbbd4006d540.tar.bz2 | |
Make queue_and_load_dwo_tu receive a dwarf2_cu
queue_and_load_dwo_tu, used as a callback for htab_traverse_noresize,
currently receives a dwarf2_per_cu_data as its `info` user data. It
accesses the current dwarf2_cu object through the dwarf2_per_cu_data::cu field.
This field will be removed, because the dwarf2_per_cu_data will become
objfile-independent, while dwarf_cu will remain objfile-dependent.
To remove references to this field, change queue_and_load_dwo_tu so
that it expects to receive a pointer to the dwarf2_cu as its info
parameter.
A reference to dwarf2_per_cu_data::cu needs to be added, but it will get
removed in a subsequent patch, when this function gets re-worked.
I kept this as a separate patch, because since there's no strong typing
here, it's easy to miss something.
gdb/ChangeLog:
* dwarf2/read.c (queue_and_load_dwo_tu): Expect a dwarf2_cu as
the info parameter.
(queue_and_load_all_dwo_tus): Pass per_cu->cu.
| -rw-r--r-- | gdb/dwarf2/read.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 2d6b9e1..3138e96 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -12792,10 +12792,9 @@ static int queue_and_load_dwo_tu (void **slot, void *info) { struct dwo_unit *dwo_unit = (struct dwo_unit *) *slot; - struct dwarf2_per_cu_data *per_cu = (struct dwarf2_per_cu_data *) info; + dwarf2_cu *cu = (dwarf2_cu *) info; ULONGEST signature = dwo_unit->signature; - struct signatured_type *sig_type = - lookup_dwo_signatured_type (per_cu->cu, signature); + signatured_type *sig_type = lookup_dwo_signatured_type (cu, signature); if (sig_type != NULL) { @@ -12804,9 +12803,9 @@ queue_and_load_dwo_tu (void **slot, void *info) /* We pass NULL for DEPENDENT_CU because we don't yet know if there's a real dependency of PER_CU on SIG_TYPE. That is detected later while processing PER_CU. */ - if (maybe_queue_comp_unit (NULL, sig_cu, per_cu->cu->language)) - load_full_type_unit (sig_cu, per_cu->cu->per_objfile); - per_cu->imported_symtabs_push (sig_cu); + if (maybe_queue_comp_unit (NULL, sig_cu, cu->language)) + load_full_type_unit (sig_cu, cu->per_objfile); + cu->per_cu->imported_symtabs_push (sig_cu); } return 1; @@ -12833,7 +12832,7 @@ queue_and_load_all_dwo_tus (struct dwarf2_per_cu_data *per_cu) dwo_file = dwo_unit->dwo_file; if (dwo_file->tus != NULL) htab_traverse_noresize (dwo_file->tus.get (), queue_and_load_dwo_tu, - per_cu); + per_cu->cu); } /* Read in various DIEs. */ |