From 30677c82cdacb008da9d1f1b8edad56de9f7f715 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 25 Feb 2020 23:12:11 -0500 Subject: [PATCH] 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. --- gdb/dwarf2/read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 5dc8a350739..7470acef879 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -12832,8 +12832,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); -- 2.47.2