From patchwork Wed May 23 04:58:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27433 Received: (qmail 114544 invoked by alias); 23 May 2018 04:59:18 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 113908 invoked by uid 89); 23 May 2018 04:59:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.119) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 May 2018 04:59:08 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway32.websitewelcome.com (Postfix) with ESMTP id EDBC9C4BE5 for ; Tue, 22 May 2018 23:59:06 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id LLrefwLWMBcCXLLrefqnAE; Tue, 22 May 2018 23:59:06 -0500 X-Authority-Reason: nr=8 Received: from 174-29-44-154.hlrn.qwest.net ([174.29.44.154]:56108 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fLLre-003S5D-NU; Tue, 22 May 2018 23:59:06 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 25/42] Remove the "listhead" argument from finish_block Date: Tue, 22 May 2018 22:58:34 -0600 Message-Id: <20180523045851.11660-26-tom@tromey.com> In-Reply-To: <20180523045851.11660-1-tom@tromey.com> References: <20180523045851.11660-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fLLre-003S5D-NU X-Source-Sender: 174-29-44-154.hlrn.qwest.net (bapiya.Home) [174.29.44.154]:56108 X-Source-Auth: tom+tromey.com X-Email-Count: 26 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes finish_block is only ever called with "&local_symbols" as the "listhead" argument. So, remove this argument. gdb/ChangeLog 2018-05-22 Tom Tromey * xcoffread.c (read_xcoff_symtab): Update. * dwarf2read.c (read_func_scope, read_lexical_block_scope): Update. * dbxread.c (process_one_symbol): Update. * coffread.c (coff_symtab_read): Update. * buildsym.h (finish_block): Update. * buildsym.c (finish_block): Remove "listhead" argument. (end_symtab_get_static_block): Update. --- gdb/ChangeLog | 11 +++++++++++ gdb/buildsym.c | 5 ++--- gdb/buildsym.h | 1 - gdb/coffread.c | 4 ++-- gdb/dbxread.c | 6 +++--- gdb/dwarf2read.c | 4 ++-- gdb/xcoffread.c | 4 ++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 3f367a3b55..516dac6b7e 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -586,12 +586,11 @@ finish_block_internal (struct symbol *symbol, struct block * finish_block (struct symbol *symbol, - struct pending **listhead, struct pending_block *old_blocks, const struct dynamic_prop *static_link, CORE_ADDR start, CORE_ADDR end) { - return finish_block_internal (symbol, listhead, old_blocks, static_link, + return finish_block_internal (symbol, &local_symbols, old_blocks, static_link, start, end, 0, 0); } @@ -1206,7 +1205,7 @@ end_symtab_get_static_block (CORE_ADDR end_addr, int expandable, int required) struct context_stack *cstk = pop_context (); /* Make a block for the local symbols within. */ - finish_block (cstk->name, &local_symbols, cstk->old_blocks, NULL, + finish_block (cstk->name, cstk->old_blocks, NULL, cstk->start_addr, end_addr); if (!buildsym_compunit->m_context_stack.empty ()) diff --git a/gdb/buildsym.h b/gdb/buildsym.h index ad56ac597f..969afbc828 100644 --- a/gdb/buildsym.h +++ b/gdb/buildsym.h @@ -144,7 +144,6 @@ extern struct symbol *find_symbol_in_list (struct pending *list, char *name, int length); extern struct block *finish_block (struct symbol *symbol, - struct pending **listhead, struct pending_block *old_blocks, const struct dynamic_prop *static_link, CORE_ADDR start, diff --git a/gdb/coffread.c b/gdb/coffread.c index a8e3f59a65..71b6ed9995 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -1139,7 +1139,7 @@ coff_symtab_read (minimal_symbol_reader &reader, enter_linenos (fcn_line_ptr, fcn_first_line, fcn_last_line, objfile); - finish_block (newobj->name, &local_symbols, newobj->old_blocks, + finish_block (newobj->name, newobj->old_blocks, NULL, newobj->start_addr, fcn_cs_saved.c_value + fcn_aux_saved.x_sym.x_misc.x_fsize @@ -1183,7 +1183,7 @@ coff_symtab_read (minimal_symbol_reader &reader, cs->c_value + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); /* Make a block for the local symbols within. */ - finish_block (0, &local_symbols, newobj->old_blocks, NULL, + finish_block (0, newobj->old_blocks, NULL, newobj->start_addr, tmpaddr); } /* Now pop locals of block just finished. */ diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 713178809b..b6a44e245e 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -2579,7 +2579,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, newobj = pop_context (); /* Make a block for the local symbols within. */ - block = finish_block (newobj->name, &local_symbols, + block = finish_block (newobj->name, newobj->old_blocks, NULL, newobj->start_addr, newobj->start_addr + valu); @@ -2668,7 +2668,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, newobj->start_addr = valu; } /* Make a block for the local symbols within. */ - finish_block (0, &local_symbols, newobj->old_blocks, NULL, + finish_block (0, newobj->old_blocks, NULL, newobj->start_addr, valu); } } @@ -2956,7 +2956,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, newobj = pop_context (); /* Make a block for the local symbols within. */ - block = finish_block (newobj->name, &local_symbols, + block = finish_block (newobj->name, newobj->old_blocks, NULL, newobj->start_addr, valu); diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 131dcfbb55..ffea27c064 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -13734,7 +13734,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) newobj = pop_context (); /* Make a block for the local symbols within. */ - block = finish_block (newobj->name, &local_symbols, newobj->old_blocks, + block = finish_block (newobj->name, newobj->old_blocks, newobj->static_link, lowpc, highpc); /* For C++, set the block's scope. */ @@ -13831,7 +13831,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu) if (local_symbols != NULL || (*get_local_using_directives ()) != NULL) { struct block *block - = finish_block (0, &local_symbols, newobj->old_blocks, NULL, + = finish_block (0, newobj->old_blocks, NULL, newobj->start_addr, highpc); /* Note that recording ranges after traversing children, as we diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index af03c11e8b..73e0638412 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -1412,7 +1412,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) break; } - finish_block (newobj->name, &local_symbols, newobj->old_blocks, + finish_block (newobj->name, newobj->old_blocks, NULL, newobj->start_addr, (fcn_cs_saved.c_value + fcn_aux_saved.x_sym.x_misc.x_fsize @@ -1504,7 +1504,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) if (local_symbols && !outermost_context_p ()) { /* Make a block for the local symbols within. */ - finish_block (newobj->name, &local_symbols, + finish_block (newobj->name, newobj->old_blocks, NULL, newobj->start_addr, (cs->c_value