From 739593e0ec988c02057a16da872b32faa992f657 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 29 Feb 2012 19:51:49 +0000 Subject: ada-lang.c:ada_find_renaming_symbol minor improvement. This is a minor improvement in ada_find_renaming_symbol: What we were doing was going from a symbol, get its name, and then search for renamings. But if the original symbol was already itself a renaming, then we'd look the symbol up again to return it. Since we had the symbol in the first place, we shouldn't need to look it up again. This is what this patch does: Modify ada_find_renaming_symbol to take a symbol instead of the symbol's (linkage) name, and then updates the one caller. gdb/ChangeLog: * ada-lang.h (ada_find_renaming_symbol): Replace parameter "name" with "struct symbol *name_sym". * ada-exp.y (write_var_or_type): Update call to ada_find_renaming_symbol. * ada-lang.c (ada_find_renaming_symbol): Replace parameter "name" with "struct symbol *name_sym". Adjust Implementation accordingly. Adjust the function documentation. --- gdb/ada-lang.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index c5d5ff7..349ca17 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -7054,16 +7054,21 @@ ada_find_any_type (const char *name) return NULL; } -/* Given NAME and an associated BLOCK, search all symbols for - NAME suffixed with "___XR", which is the ``renaming'' symbol - associated to NAME. Return this symbol if found, return - NULL otherwise. */ +/* Given NAME_SYM and an associated BLOCK, find a "renaming" symbol + associated with NAME_SYM's name. NAME_SYM may itself be a renaming + symbol, in which case it is returned. Otherwise, this looks for + symbols whose name is that of NAME_SYM suffixed with "___XR". + Return symbol if found, and NULL otherwise. */ struct symbol * -ada_find_renaming_symbol (const char *name, struct block *block) +ada_find_renaming_symbol (struct symbol *name_sym, struct block *block) { + const char *name = SYMBOL_LINKAGE_NAME (name_sym); struct symbol *sym; + if (strstr (name, "___XR") != NULL) + return name_sym; + sym = find_old_style_renaming_symbol (name, block); if (sym != NULL) -- cgit v1.1