From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 19353384601F for ; Wed, 8 May 2024 20:22:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 19353384601F 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 19353384601F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715199755; cv=none; b=cAu5h1jtdl2wx9XEm/4mpWDFiPfJgO6y6W02KU2jmM8a/VdlcnycT6w+Jd2t9CNMoGk0LaOPCNFtIiI9SmnkAX12fxLPzheRXNBKChzUIBEH59Cr6kAIXx/uSA2KAQthxXMfCpMhRRv6D3fJy9MORThERxSuWnawOyVUDXg0h88= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715199755; c=relaxed/simple; bh=7SzqtONYSBqR+3C4gOf3dNdJgVMqUdnxO/ISyDdIx0k=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=GfUZFeqt+omOLTTc3b3W4ThHzyCvngFQ5Cp+0uCSgZ+eX03TbdGVCnBoMdUj4bZXtlk22aBT+vhdFmrDcg4G53O9TUTxETPFiLnQ7bAUl+BPRfBqNFj6G3nzkVGgfwXnQnqv1ok9WOZ6DlWPF7e7ai26JutcNhlvpqCrYc+FhOg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-41ebcf01013so1122375e9.0 for ; Wed, 08 May 2024 13:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jetbrains.com; s=googleapps; t=1715199751; x=1715804551; 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=6zmin7rqm84wDEy+3wPgdzuTIiRLOUvy0QIsZaRZnhg=; b=gTKO+/6PuWMhbYLbjn887NQgjnUxrM8iiyHlG3DxwcbqUDjr64rE7UZDhnur34xjPb G/xxHHWzu6Cn+Z7XcD+W3wbFgalgJlfYX8DjwOSFVI5SnMlI1D7iXa4qTcf/fYB01ztQ RpH+9m+aLobnrKrN0xd8vBvDNOfQfcWIm1Q/4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715199751; x=1715804551; 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=6zmin7rqm84wDEy+3wPgdzuTIiRLOUvy0QIsZaRZnhg=; b=FxaOcppBjefXu6CUr7TsOD9CkBeluaDeMJJPXLpN5FgngPSmOXMV/OpyLlkdbvwl/u coeik9vGImfI4dFnfI8EnadTuJRUk5hDHZNZmYpc+IoWdhh7d8ldc+trMjQXCbB/PHiN nol2aYgCioGtLkyi5nSWqcGuBJiLOj55XXpYJPkwCDqUxhUTqP9vdVmR1K/TaKOZLXyW M6I54z8RApT8fe4uLnJ+gb/8W0trijLpn7zCB3TVdvaYmKIzbpPqFLkwDSTWgYIFnx0O 31LUi3c+Gsiu2GrO7LwLz9wI9hP0QH+VTRvO8C6AnLYOkV+sTBFbjJ5E3Kfnr70yhhwN roEw== X-Gm-Message-State: AOJu0YwloSDB15s65L+ZyptPP9ayeGtUf2T0Cjf0JNlFkGgT8aZ0sysx QeiGpJO8JbblFt/jRkTiYOmPMtLVa8wMS7g2Ioiu8vhz3CfD1wi3kM4N1rhIzA0SfuwDJtJNuJ0 = X-Google-Smtp-Source: AGHT+IF9EZO00AkQYRWhT+qiGeplEUbAqDyeU0ppMInCd32aACcicMB23u6vO64gco562QMKnRmFMQ== X-Received: by 2002:a05:600c:1d05:b0:41a:4623:7ee9 with SMTP id 5b1f17b1804b1-41fbcb4fb4amr5998745e9.10.1715199751694; Wed, 08 May 2024 13:22:31 -0700 (PDT) Received: from lubuntu2.labs.intellij.net (ad96e1c12.dsl.de.colt.net. [217.110.28.18]) by smtp.gmail.com with ESMTPSA id bi18-20020a05600c3d9200b0041bff91ea43sm3398186wmb.37.2024.05.08.13.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 13:22:31 -0700 (PDT) From: Dmitry Neverov To: gdb-patches@sourceware.org Cc: dmitry.neverov@jetbrains.com Subject: [PATCH v3][PR symtab/30520 v2 4/4] gdb/symtab: use symbol name matcher for all segments in a qualified name Date: Wed, 8 May 2024 22:22:19 +0200 Message-Id: <20240508202219.3584915-4-dmitry.neverov@jetbrains.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240508202219.3584915-1-dmitry.neverov@jetbrains.com> References: <20240508202219.3584915-1-dmitry.neverov@jetbrains.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 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 48d5dc11d1d..f9cf76c613d 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.40.1