From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 9D0463858C62 for ; Mon, 6 May 2024 15:09:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9D0463858C62 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 9D0463858C62 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::431 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715008181; cv=none; b=dMYaEfmzNfrzf2LRRvEG9Qy3Thp/hIRdmIIbvWpOAVfEZHRE9HY0nbA3afMOZw8IWn3509h210omDlB1BHMnqjqKLJSA2V8tiDT3Bio7nIsF9vFVshKZzioWHCmogdKuKQDD0sxYc9rNkqOh9BS4Cef9EbEEQqQ7jmkvBiyOE2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715008181; c=relaxed/simple; bh=MoHu5YXacq450WE/r9pza9MhcODPzBmK/L4+G4mgaYI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=ODAQMVkAYg7TjS5RK18qFiuPI226Zn6bO0xj6OB5r+vR8t4zxi4d5gECv7w33einhK3wp7WODHn1KYu5AMtyn26IJzVdryr4mKSX/uMUjYvqLLArGUAymU6xIc65KZC0gdmmRqcs/voU/MMHOdMq4JvUAFyDp0K2e23fTy/sBCA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-34da84cb755so1671819f8f.2 for ; Mon, 06 May 2024 08:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jetbrains.com; s=googleapps; t=1715008177; x=1715612977; 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=s9I8RmdbTTIydGIUz6UTZFDGQIt/h9kpFTPxnbmBfbY=; b=fj5aCVpLCpTNNOsCrqZ+xFP3XKDwRoeW0gTNpzhqB10FrKyaVgzYmuAlAn+ylFZnG+ vGyBOPgc7yKQus7CbkvMlRoS70YOFap9YymrrWFeiKUWV9rLzUjqYAXa9tWZm+BbJvhs zh6dQB+sfwPa/aFBMjuJ+MhJ7qKY/6jtU1F8k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715008177; x=1715612977; 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=s9I8RmdbTTIydGIUz6UTZFDGQIt/h9kpFTPxnbmBfbY=; b=JQqKdVeMoMff4y+55kTIQX+Zh+OqPyB7KwkGka7ejGQ2IV0GrW7D2XMk4mTKaPdWPF ekPTzqY7PxWgsy8058uiSrdBwAwBUsozeQuvZaKI/ZZCwpPF4sHDmUrLDB76dxNLw5eI oXiEOSfnnYHbLkW6mbGPXz2StVZJcoFtUAWOR4HMTSBLomfAwGnNBbJYnwCZpHEsnWZO eLxwdhf5ZqsHTrxO4UZEQZb34/m3AsEConTbKemfJNq71AXlSGemr8ArDiRzCpHHUP5O dirjxAbv9WJKvrCBZW2IfABIy0odDle1Fq+kfD4HeY3LQ8QxpnMoJX8dFzwDZ9bOrjIl EmgA== X-Gm-Message-State: AOJu0Yw+/MTb/H+PUvCuLtXvdpgHy2SZ07t07z8AJwJ8rP2DDG6g2jMT nnz2BLVQCS9Y6sDI23pEGEFszq/kd/xzEPTMwDlXdk48ZAOKZoB3hKwcKgJ+hioBIHzzBKxwHv0 = X-Google-Smtp-Source: AGHT+IG+Cu3X91QkdfpGYJEMf+LrOXAy7y9+hMaEvD+sajdviKWMIxlAcl2vFf0yZOz55HDf2hU4Pg== X-Received: by 2002:adf:f6d1:0:b0:34d:9e54:11ec with SMTP id y17-20020adff6d1000000b0034d9e5411ecmr6512249wrp.5.1715008177264; Mon, 06 May 2024 08:09:37 -0700 (PDT) Received: from lubuntu2.labs.intellij.net (ad96e1c12.dsl.de.colt.net. [217.110.28.18]) by smtp.gmail.com with ESMTPSA id e30-20020a5d595e000000b0034e8784473dsm7965982wri.41.2024.05.06.08.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 08:09:36 -0700 (PDT) From: Dmitry Neverov To: gdb-patches@sourceware.org Cc: dmitry.neverov@jetbrains.com Subject: [PATCH v3][PR symtab/30520 4/4] gdb/symtab: use symbol name matcher for all segments in a qualified name Date: Mon, 6 May 2024 17:09:20 +0200 Message-Id: <20240506150920.1220092-4-dmitry.neverov@jetbrains.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240506150920.1220092-1-dmitry.neverov@jetbrains.com> References: <20240506150920.1220092-1-dmitry.neverov@jetbrains.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --- gdb/dwarf2/read.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index f2842f0f581..e8416905163 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -16644,12 +16644,16 @@ cooked_index_functions::expand_symtabs_matching { 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::FULL, completing, true); + 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::FULL, 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; @@ -16678,13 +16682,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 (); } @@ -16708,9 +16723,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.34.1