Micro-optimize cooked_index_entry::full_name I noticed that cooked_index_entry::full_name can return the canonical string when there is no parent entry. Regression tested on x86-64 Fedora 34.
diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index b66ef5a..d8a1ab8 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c
@@ -50,7 +50,7 @@ eq_entry (const void *a, const void *b) const char * cooked_index_entry::full_name (struct obstack *storage) const { - if ((flags & IS_LINKAGE) != 0) + if ((flags & IS_LINKAGE) != 0 || parent_entry == nullptr) return canonical; const char *sep = nullptr; @@ -66,13 +66,12 @@ cooked_index_entry::full_name (struct obstack *storage) const case language_ada: sep = "."; break; + + default: + return canonical; } - if (sep == nullptr) - return canonical; - - if (parent_entry != nullptr) - parent_entry->write_scope (storage, sep); + parent_entry->write_scope (storage, sep); obstack_grow0 (storage, canonical, strlen (canonical)); return (const char *) obstack_finish (storage); }