From 3c86fae3d99bf7b5360b810cc5b19522430ce39d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 29 Mar 2022 16:14:36 -0400 Subject: gdb: remove symtab::objfile Same idea as previous patch, but for symtab::objfile. I find it clearer without this wrapper, as it shows that the objfile is common to all symtabs of a given compunit. Otherwise, you could think that each symtab (of a given compunit) can have a specific objfile. Change-Id: Ifc0dbc7ec31a06eefa2787c921196949d5a6fcc6 --- gdb/guile/scm-symtab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/guile') diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c index 386ccf5..1ba5cb5 100644 --- a/gdb/guile/scm-symtab.c +++ b/gdb/guile/scm-symtab.c @@ -109,7 +109,7 @@ stscm_eq_symtab_smob (const void *ap, const void *bp) static htab_t stscm_objfile_symtab_map (struct symtab *symtab) { - struct objfile *objfile = symtab->objfile (); + struct objfile *objfile = symtab->compunit ()->objfile (); htab_t htab = (htab_t) objfile_data (objfile, stscm_objfile_data_key); if (htab == NULL) @@ -348,7 +348,7 @@ gdbscm_symtab_objfile (SCM self) = stscm_get_valid_symtab_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct symtab *symtab = st_smob->symtab; - return ofscm_scm_from_objfile (symtab->objfile ()); + return ofscm_scm_from_objfile (symtab->compunit ()->objfile ()); } /* (symtab-global-block ) -> @@ -366,7 +366,7 @@ gdbscm_symtab_global_block (SCM self) blockvector = symtab->compunit ()->blockvector (); block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); - return bkscm_scm_from_block (block, symtab->objfile ()); + return bkscm_scm_from_block (block, symtab->compunit ()->objfile ()); } /* (symtab-static-block ) -> @@ -384,7 +384,7 @@ gdbscm_symtab_static_block (SCM self) blockvector = symtab->compunit ()->blockvector (); block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK); - return bkscm_scm_from_block (block, symtab->objfile ()); + return bkscm_scm_from_block (block, symtab->compunit ()->objfile ()); } /* Administrivia for sal (symtab-and-line) smobs. */ -- cgit v1.1