aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2018-04-26 13:01:26 +0100
committerPedro Alves <palves@redhat.com>2018-04-26 13:07:25 +0100
commita0aca7b0e13d884f43ba77c4c6d752d9140cb54b (patch)
treec3aeeaa0c3ff84bc0e8f0f90b82952a75d69e334
parent76af0f26356580771a18c37de4ebccdfbc449356 (diff)
downloadgdb-a0aca7b0e13d884f43ba77c4c6d752d9140cb54b.zip
gdb-a0aca7b0e13d884f43ba77c4c6d752d9140cb54b.tar.gz
gdb-a0aca7b0e13d884f43ba77c4c6d752d9140cb54b.tar.bz2
Eliminate find_pc_partial_function_gnu_ifunc
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: 2018-04-26 Pedro Alves <palves@redhat.com> * 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.
-rw-r--r--gdb/ChangeLog10
-rw-r--r--gdb/blockframe.c36
-rw-r--r--gdb/symtab.h5
3 files changed, 17 insertions, 34 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a94e75..d10252e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
2018-04-26 Pedro Alves <palves@redhat.com>
+ * 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.
+
+2018-04-26 Pedro Alves <palves@redhat.com>
+
* linespec.c (struct bound_minimal_symbol_search_key): New.
(convert_linespec_to_sals): Sort minimal symbols earlier. Don't
skip first line if we found a GNU ifunc minimal symbol by name.
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index e6938a3..b3c9aa3 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 017a690..a89d597 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 *,