From patchwork Fri Mar 9 21:16:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 26262 Received: (qmail 28104 invoked by alias); 9 Mar 2018 21:16:22 -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 28014 invoked by uid 89); 9 Mar 2018 21:16:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=halfway X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 09 Mar 2018 21:16:20 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C245A402678E for ; Fri, 9 Mar 2018 21:16:18 +0000 (UTC) Received: from localhost.localdomain (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7341F2026DFD for ; Fri, 9 Mar 2018 21:16:18 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 08/11] Eliminate find_pc_partial_function_gnu_ifunc Date: Fri, 9 Mar 2018 21:16:09 +0000 Message-Id: <20180309211612.12941-9-palves@redhat.com> In-Reply-To: <20180309211612.12941-1-palves@redhat.com> References: <20180309211612.12941-1-palves@redhat.com> Not used anywhere any longer. If this is ever reinstated, note that this case: cache_pc_function_is_gnu_ifunc = TYPE_GNU_IFUNC (SYMBOL_TYPE (f)); was incorrect in that regular symbols never have type marked as GNU ifunc type, only minimal symbols. At some point I had some fix that checking the matching minsym here. But in the end I ended up just eliminating need for this function, so that fix was not necessary. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * blockframe.c (cache_pc_function_is_gnu_ifunc): Delete. Remove all references. (find_pc_partial_function_gnu_ifunc): Rename to ... (find_pc_partial_function): ... this, and remove references to 'is_gnu_ifunc_p'. (find_pc_partial_function): Delete old implementation. * symtab.h (find_pc_partial_function_gnu_ifunc): Delete. --- gdb/blockframe.c | 36 +++++++----------------------------- gdb/symtab.h | 5 ----- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/gdb/blockframe.c b/gdb/blockframe.c index db02b35742d..1a28b3c8b5f 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -159,7 +159,6 @@ static CORE_ADDR cache_pc_function_low = 0; static CORE_ADDR cache_pc_function_high = 0; static const char *cache_pc_function_name = 0; static struct obj_section *cache_pc_function_section = NULL; -static int cache_pc_function_is_gnu_ifunc = 0; /* Clear cache, e.g. when symbol table is discarded. */ @@ -170,7 +169,6 @@ clear_pc_function_cache (void) cache_pc_function_high = 0; cache_pc_function_name = (char *) 0; cache_pc_function_section = NULL; - cache_pc_function_is_gnu_ifunc = 0; } /* Finds the "function" (text symbol) that is smaller than PC but @@ -178,19 +176,17 @@ clear_pc_function_cache (void) *NAME and/or *ADDRESS conditionally if that pointer is non-null. If ENDADDR is non-null, then set *ENDADDR to be the end of the function (exclusive), but passing ENDADDR as non-null means that - the function might cause symbols to be read. If IS_GNU_IFUNC_P is provided - *IS_GNU_IFUNC_P is set to 1 on return if the function is STT_GNU_IFUNC. - This function either succeeds or fails (not halfway succeeds). If it - succeeds, it sets *NAME, *ADDRESS, and *ENDADDR to real information and - returns 1. If it fails, it sets *NAME, *ADDRESS, *ENDADDR and - *IS_GNU_IFUNC_P to zero and returns 0. */ + the function might cause symbols to be read. This function either + succeeds or fails (not halfway succeeds). If it succeeds, it sets + *NAME, *ADDRESS, and *ENDADDR to real information and returns 1. + If it fails, it sets *NAME, *ADDRESS and *ENDADDR to zero and + returns 0. */ /* Backward compatibility, no section argument. */ int -find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name, - CORE_ADDR *address, CORE_ADDR *endaddr, - int *is_gnu_ifunc_p) +find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, + CORE_ADDR *endaddr) { struct obj_section *section; struct symbol *f; @@ -243,7 +239,6 @@ find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name, cache_pc_function_high = BLOCK_END (SYMBOL_BLOCK_VALUE (f)); cache_pc_function_name = SYMBOL_LINKAGE_NAME (f); cache_pc_function_section = section; - cache_pc_function_is_gnu_ifunc = TYPE_GNU_IFUNC (SYMBOL_TYPE (f)); goto return_cached_value; } } @@ -266,16 +261,12 @@ find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name, *address = 0; if (endaddr != NULL) *endaddr = 0; - if (is_gnu_ifunc_p != NULL) - *is_gnu_ifunc_p = 0; return 0; } cache_pc_function_low = BMSYMBOL_VALUE_ADDRESS (msymbol); cache_pc_function_name = MSYMBOL_LINKAGE_NAME (msymbol.minsym); cache_pc_function_section = section; - cache_pc_function_is_gnu_ifunc = (MSYMBOL_TYPE (msymbol.minsym) - == mst_text_gnu_ifunc); cache_pc_function_high = minimal_symbol_upper_bound (msymbol); return_cached_value: @@ -307,22 +298,9 @@ find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name, *endaddr = cache_pc_function_high; } - if (is_gnu_ifunc_p) - *is_gnu_ifunc_p = cache_pc_function_is_gnu_ifunc; - return 1; } -/* See find_pc_partial_function_gnu_ifunc, only the IS_GNU_IFUNC_P parameter - is omitted here for backward API compatibility. */ - -int -find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, - CORE_ADDR *endaddr) -{ - return find_pc_partial_function_gnu_ifunc (pc, name, address, endaddr, NULL); -} - /* See symtab.h. */ struct type * diff --git a/gdb/symtab.h b/gdb/symtab.h index 52ab1357300..483e643ebdb 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1665,11 +1665,6 @@ extern struct symbol *find_pc_sect_function (CORE_ADDR, struct obj_section *); extern struct symbol *find_symbol_at_address (CORE_ADDR); -extern int find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name, - CORE_ADDR *address, - CORE_ADDR *endaddr, - int *is_gnu_ifunc_p); - /* lookup function from address, return name, start addr and end addr. */ extern int find_pc_partial_function (CORE_ADDR, const char **, CORE_ADDR *,