From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QLkIK5bxr2U6dAUAWB0awg (envelope-from ) for ; Tue, 23 Jan 2024 12:04:22 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=jetbrains.com header.i=@jetbrains.com header.a=rsa-sha256 header.s=googleapps header.b=Nu8+dLMi; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id AB6621E0C3; Tue, 23 Jan 2024 12:04:22 -0500 (EST) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 988341E092 for ; Tue, 23 Jan 2024 12:04:20 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DE90D3858014 for ; Tue, 23 Jan 2024 17:04:19 +0000 (GMT) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 360BA3858C2C for ; Tue, 23 Jan 2024 17:03:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 360BA3858C2C Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=jetbrains.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=jetbrains.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 360BA3858C2C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::633 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706029427; cv=none; b=SH9RldVIJq+nrUTUc7rK5OWYOZvN505mlhg/1YPiYtJoVRQv9KCPGjL+E0efMp1UY/+vqR//buael8TTzmpMIkFFr48wWsKDX0DDKNio1qVII3qGPIhh/5Iszkgb+LvaHfiL84RPIXqJHSDkf0jhYmXvWwTD1rzO7KYUVjZSgaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706029427; c=relaxed/simple; bh=Da9+GYxQe1ZfPinLGuqLFiowPrgQLSD08i754EDy9bg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=qpiCZlTAAvJpHvNZ9wef484GYdeqZMvFO0KlMuffNx4jDKRYvDaVkuXElTC1mpPS3S4n47A2scKfYWHgWBMqIpv/CJZsIXxzyeqjourQhV+U8f2kphPLSDpaAZ9BRk3MWdvzvO3gQ53JmgYlroBBf++FSFdpRxNguUvSylPsON4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a28ab7ae504so377805866b.3 for ; Tue, 23 Jan 2024 09:03:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jetbrains.com; s=googleapps; t=1706029414; x=1706634214; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gr4D9ONMRV2SUXM0PazBjsskWQmop3oZttBK8T9oPKs=; b=Nu8+dLMipjooYZSeYyTnrlUTXoobxt3XjHqjbFyxzbcbKkMW6XjJf4+WqvT/Qd4wMi tsAktJneSMhq4dp+TBh7Ny/Q8z4iBAuEqB00A0DKzw0YPAQMoMD1BxcnTQUo60s6YJxg vDkffxy3+S37UoO1c3zNYT06CI3dcBQuegIkU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706029414; x=1706634214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gr4D9ONMRV2SUXM0PazBjsskWQmop3oZttBK8T9oPKs=; b=q5BCGx4tgOn9ar/yAPTOW4Y2vfGSNbsRNqr2yfBkl3brej5ndt28AcUO4t50qRGHk1 JWr2HS7XjgeBwEuBvssXCobZxShLWtJYvlHt5M2NpWkBP05S8O9sMQrYjH/YMvsSb+mh p9yXcndt6vfoi4MwV4b3ThH1piHU+zMqYP1iX4jiAMYreJEY9pj7OHgGWjoYNCvuPvFH YfJFjADrUljLi6A4VR5JiWCjTXNlltIon4fu68Pr+5iL2uxIDgv+YKiKfrAY6U/e6Ugr 0O+UjskN3l+WHIsIxNnvdwl6YZXTgBOWRJ8VpTW5wFCqiDp8xOfhteBKk7y44Vd+irFt GsJQ== X-Gm-Message-State: AOJu0Ywy6bxk1dJy0egbprXNUo5dprXGDL2Q6CiMoptetl3GNba1wukf w3geUgCKpDCbEY0lWzPkd6VMmTH7IFVQaRaXlMhXqtSUyRGDmh9E3l+nJfEyolo2Roc2JXOa4J/ kxw== X-Google-Smtp-Source: AGHT+IFS/LpqtqHgNA6rQB38qql4JZzmJhH7l4JtmymZhnLVTLXzMggwhsMyK3z2PDlKVvEprbLbyw== X-Received: by 2002:a17:906:4894:b0:a30:9db2:b2e with SMTP id v20-20020a170906489400b00a309db20b2emr112563ejq.71.1706029414685; Tue, 23 Jan 2024 09:03:34 -0800 (PST) Received: from nd-lubuntu.labs.intellij.net (ad96e1c12.dsl.de.colt.net. [217.110.28.18]) by smtp.gmail.com with ESMTPSA id p26-20020a1709061b5a00b00a298ade2e72sm14569741ejg.195.2024.01.23.09.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 09:03:34 -0800 (PST) From: Dmitry Neverov To: gdb-patches@sourceware.org Cc: dmitry.neverov@jetbrains.com Subject: [RFC v2][PR symtab/30520 4/4] gdb/symtab: use symbol name matcher for all segments in a qualified name Date: Tue, 23 Jan 2024 18:03:25 +0100 Message-Id: <20240123170325.752251-4-dmitry.neverov@jetbrains.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240123170325.752251-1-dmitry.neverov@jetbrains.com> References: <20240123170325.752251-1-dmitry.neverov@jetbrains.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org --- gdb/dwarf2/read.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 338e2bfbfa7..08a834e141b 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -16637,14 +16637,17 @@ cooked_index_functions::expand_symtabs_matching for (enum language lang : unique_styles) { - std::vector name_vec - = lookup_name_without_params.split_name (lang); - std::string last_name (name_vec.back ()); - - lookup_name_info last_segment_lookup_name ( - last_name, symbol_name_match_type::SEARCH_NAME, completing, true); + std::vector name_vec = lookup_name_without_params + .split_name (lang); + std::vector name_str_vec (name_vec.begin (), name_vec.end ()); + std::vector segment_lookup_names; + segment_lookup_names.reserve (name_vec.size ()); + for (auto &segment_name : name_str_vec) { + segment_lookup_names.emplace_back ( + segment_name, symbol_name_match_type::SEARCH_NAME, completing, true); + } - for (const cooked_index_entry *entry : table->find (last_name, + for (const cooked_index_entry *entry : table->find (name_str_vec.back (), completing)) { QUIT; @@ -16674,13 +16677,24 @@ cooked_index_functions::expand_symtabs_matching { /* If we ran out of entries, or if this segment doesn't match, this did not match. */ - if (parent == nullptr - || strncmp (parent->name, name_vec[i - 1].data (), - name_vec[i - 1].length ()) != 0) + if (parent == nullptr) { found = false; break; } + if (parent->lang != language_unknown) + { + const language_defn *lang_def = language_def (parent->lang); + symbol_name_matcher_ftype *name_matcher + = lang_def->get_symbol_name_matcher + (segment_lookup_names[i-1]); + if (!name_matcher (parent->canonical, + segment_lookup_names[i-1], nullptr)) + { + found = false; + break; + } + } parent = parent->get_parent (); } @@ -16704,9 +16718,9 @@ cooked_index_functions::expand_symtabs_matching const language_defn *lang_def = language_def (entry->lang); symbol_name_matcher_ftype *name_matcher = lang_def->get_symbol_name_matcher - (last_segment_lookup_name); + (segment_lookup_names.back ()); if (!name_matcher (entry->canonical, - last_segment_lookup_name, nullptr)) + segment_lookup_names.back (), nullptr)) continue; } } -- 2.39.2