This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Don't check PST is NULL in read_symtab
On 01/11/2013 12:52 PM, Joel Brobecker wrote:
> FWIW, you can also do the re-indent, and then post two parallel
> patches: One is the actual patch, the second is a sub-part of
> the actual patch where whitespace differences are ignored.
> That's usually how I verify that my reformatting did not cause
> any intentional changes...
I see. Below is the patch to indent the code. Thanks for your
suggestion, Joel.
>
>> >2013-01-11 Yao Qi<yao@codesourcery.com>
>> >
>> > * dbxread.c (dbx_psymtab_to_symtab_1): Don't check PST is NULL.
>> > * dwarf2read.c (dwarf2_psymtab_to_symtab): Likewise.
>> > * mdebugread.c (mdebug_psymtab_to_symtab): Likewise.
>> > * xcoffread.c (xcoff_psymtab_to_symtab_1): Likewise.
> If PST must not be NULL, I think that it should be documented in
> psympriv.h. I am also wondering whether an assertion would be
> useful or not; maybe not, just thinking out loud.
>
IMO, we don't need an assertion to check PST, because the function is
used in this way,
(*pst->read_symtab) (objfile, pst);
which guarantees PST cant' be NULL. "PST" here is analogous to "this"
object in C++, and we don't have to document function read_symtab that
"this object must not be NULL".
--
Yao (éå)
gdb:
2013-01-11 Yao Qi <yao@codesourcery.com>
* dwarf2read.c (dwarf2_psymtab_to_symtab): Code indent.
---
gdb/dwarf2read.c | 62 +++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index f2d6a0a..2cefee9 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6410,45 +6410,45 @@ locate_pdi_sibling (const struct die_reader_specs *reader,
static void
dwarf2_psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
{
- if (pst->readin)
+ if (pst->readin)
+ {
+ warning (_("bug: psymtab for %s is already read in."),
+ pst->filename);
+ }
+ else
+ {
+ if (info_verbose)
{
- warning (_("bug: psymtab for %s is already read in."),
- pst->filename);
+ printf_filtered (_("Reading in symbols for %s..."),
+ pst->filename);
+ gdb_flush (gdb_stdout);
}
- else
- {
- if (info_verbose)
- {
- printf_filtered (_("Reading in symbols for %s..."),
- pst->filename);
- gdb_flush (gdb_stdout);
- }
- /* Restore our global data. */
- dwarf2_per_objfile = objfile_data (objfile, dwarf2_objfile_data_key);
+ /* Restore our global data. */
+ dwarf2_per_objfile = objfile_data (objfile, dwarf2_objfile_data_key);
- /* If this psymtab is constructed from a debug-only objfile, the
- has_section_at_zero flag will not necessarily be correct. We
- can get the correct value for this flag by looking at the data
- associated with the (presumably stripped) associated objfile. */
- if (objfile->separate_debug_objfile_backlink)
- {
- struct dwarf2_per_objfile *dpo_backlink
- = objfile_data (objfile->separate_debug_objfile_backlink,
- dwarf2_objfile_data_key);
+ /* If this psymtab is constructed from a debug-only objfile, the
+ has_section_at_zero flag will not necessarily be correct. We
+ can get the correct value for this flag by looking at the data
+ associated with the (presumably stripped) associated objfile. */
+ if (objfile->separate_debug_objfile_backlink)
+ {
+ struct dwarf2_per_objfile *dpo_backlink
+ = objfile_data (objfile->separate_debug_objfile_backlink,
+ dwarf2_objfile_data_key);
- dwarf2_per_objfile->has_section_at_zero
- = dpo_backlink->has_section_at_zero;
- }
+ dwarf2_per_objfile->has_section_at_zero
+ = dpo_backlink->has_section_at_zero;
+ }
- dwarf2_per_objfile->reading_partial_symbols = 0;
+ dwarf2_per_objfile->reading_partial_symbols = 0;
- psymtab_to_symtab_1 (pst);
+ psymtab_to_symtab_1 (pst);
- /* Finish up the debug error message. */
- if (info_verbose)
- printf_filtered (_("done.\n"));
- }
+ /* Finish up the debug error message. */
+ if (info_verbose)
+ printf_filtered (_("done.\n"));
+ }
process_cu_includes ();
}
--
1.7.7.6