From: Yao Qi <yao@codesourcery.com>
To: Tom Tromey <tromey@redhat.com>
Cc: Joel Brobecker <brobecker@adacore.com>, <gdb-patches@sourceware.org>
Subject: [committed]: [PATCH] Don't check PST is NULL in read_symtab
Date: Mon, 14 Jan 2013 12:42:00 -0000 [thread overview]
Message-ID: <50F3DEBC.3020203@codesourcery.com> (raw)
In-Reply-To: <87txqnsqsg.fsf@fleche.redhat.com>
On 01/11/2013 11:06 PM, Tom Tromey wrote:
> Sure. Though I am ok with just a comment as well.
Below is what I committed, with the comments added.
--
Yao (é½å°§)
gdb:
2013-01-14 Yao Qi <yao@codesourcery.com>
* dbxread.c (dbx_psymtab_to_symtab_1): Don't check PST is NULL.
(dbx_psymtab_to_symtab): Likewise.
* dwarf2read.c (dwarf2_psymtab_to_symtab): Likewise.
* mdebugread.c (mdebug_psymtab_to_symtab): Likewise.
* xcoffread.c (xcoff_psymtab_to_symtab_1): Likewise.
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index ebe4237..16496d1 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -2406,9 +2406,6 @@ dbx_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst)
struct cleanup *old_chain;
int i;
- if (!pst)
- return;
-
if (pst->readin)
{
fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. "
@@ -2455,7 +2452,7 @@ dbx_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst)
}
/* Read in all of the symbols for a given psymtab for real.
- Be verbose about it if the user wants that. */
+ Be verbose about it if the user wants that. PST is not NULL. */
static void
dbx_psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
@@ -2463,9 +2460,6 @@ dbx_psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
bfd *sym_bfd;
struct cleanup *back_to = NULL;
- if (!pst)
- return;
-
if (pst->readin)
{
fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. "
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index e2088f1..7af89c6 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6405,52 +6405,50 @@ locate_pdi_sibling (const struct die_reader_specs *reader,
return skip_children (reader, info_ptr);
}
-/* Expand this partial symbol table into a full symbol table. */
+/* Expand this partial symbol table into a full symbol table. PST is
+ not NULL. */
static void
dwarf2_psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
{
- if (pst != NULL)
+ 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 ();
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 856ca9d..2eb0536 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -273,14 +273,11 @@ static char *mdebug_next_symbol_text (struct objfile *);
/* Exported procedure: Builds a symtab from the PST partial one.
Restores the environment in effect when PST was created, delegates
most of the work to an ancillary procedure, and sorts
- and reorders the symtab list at the end. */
+ and reorders the symtab list at the end. PST is not NULL. */
static void
mdebug_psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
{
- if (!pst)
- return;
-
if (info_verbose)
{
printf_filtered (_("Reading in symbols for %s..."), pst->filename);
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 9fe8621..41aaf02 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -1855,14 +1855,11 @@ xcoff_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst)
}
/* Read in all of the symbols for a given psymtab for real.
- Be verbose about it if the user wants that. */
+ Be verbose about it if the user wants that. PST is not NULL. */
static void
xcoff_psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
{
- if (!pst)
- return;
-
if (pst->readin)
{
fprintf_unfiltered
next prev parent reply other threads:[~2013-01-14 12:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-11 1:57 Yao Qi
2013-01-11 4:52 ` Joel Brobecker
2013-01-11 14:34 ` Tom Tromey
2013-01-11 14:56 ` Yao Qi
2013-01-11 15:06 ` Tom Tromey
2013-01-14 12:42 ` Yao Qi [this message]
2013-01-14 12:44 ` [committed]: " Yao Qi
2013-01-11 14:46 ` Yao Qi
2013-01-11 15:06 ` Joel Brobecker
2013-01-11 18:02 ` Pedro Alves
2013-01-11 18:44 ` Joel Brobecker
2013-01-14 12:42 ` Yao Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50F3DEBC.3020203@codesourcery.com \
--to=yao@codesourcery.com \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=tromey@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox