From 72b580b8f48927cf7bc4cf8bb951aaeff637d0ee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 19 Apr 2022 23:44:50 -0600 Subject: [PATCH] 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. --- gdb/dwarf2/cooked-index.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index b66ef5a1c64..d8a1ab8d30e 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; - } - if (sep == nullptr) - return canonical; + default: + 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); } -- 2.30.2