From patchwork Thu Jan 18 20:32:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 84390 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D7203858283 for ; Thu, 18 Jan 2024 20:38:05 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id 374A43858427 for ; Thu, 18 Jan 2024 20:32:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 374A43858427 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 374A43858427 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705609947; cv=none; b=FEq2XkBxNY6YzwOAziP8CnEJYta3b9R8KUvmPptdnTTCp286TVGWT8ZE1Gv9bydRcPxPs4gUyjsmukbKKkMQvRyOsb+/tNqHXLgr9T2rxRBvYfxToyGiT2UrTuxSWLoz8JWbRmhb71ASckC2B5Frtu9jKDC3Wa77aMUgIM4QAY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705609947; c=relaxed/simple; bh=ZnsEjaCtnpKqP1dze7NBCQN1OD8KYE47gRYGZMizjLI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mUh6kUEvZIg8+5HJHh2/zXWeNrdMzZhGGUZFc83knMxA1jZGnETA5Pj4258ERg9EGYwwN4Cp+ZvjsllHSbCI8mGks/13rz3xI/gUhi2X4UIMhQiwV+UtppuGYYC2Nd/2TQub1IBIhUl0zj1aDRfhUX8p/fPJ5M4noSWm2C8r7S8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id QYaDr7U9nAxAkQZ3vrR5di; Thu, 18 Jan 2024 20:32:31 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id QZ3erjZP3fPByQZ3erj6OM; Thu, 18 Jan 2024 20:32:14 +0000 X-Authority-Analysis: v=2.4 cv=T+af8tGQ c=1 sm=1 tr=0 ts=65a98ace a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=DXojhDegXKjf2IFW-d0A:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=j50eceDe+7hSgH8QTJcDU6SrLByBDCzJ9RifaAO78pA=; b=nFZZTv5ieDukjwAYk/druM4A4X 6QXUiifmzUp29cYh1GU2RwA3ijJcKvDW9E4uELn3cp7oKBcwWsv4XUTYCK4SKwfTiKHZFyiTP17GD +mNcaN2z3YfPCBeQjZs3C3OPC; Received: from 97-122-68-157.hlrn.qwest.net ([97.122.68.157]:50746 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rQZ3d-002DCj-3B for gdb-patches@sourceware.org; Thu, 18 Jan 2024 13:32:14 -0700 From: Tom Tromey Date: Thu, 18 Jan 2024 13:32:24 -0700 Subject: [PATCH v2 26/30] Only search types in cp_lookup_rtti_type MIME-Version: 1.0 Message-Id: <20240118-submit-domain-hacks-2-v2-26-aecab29fa104@tromey.com> References: <20240118-submit-domain-hacks-2-v2-0-aecab29fa104@tromey.com> In-Reply-To: <20240118-submit-domain-hacks-2-v2-0-aecab29fa104@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.68.157 X-Source-L: No X-Exim-ID: 1rQZ3d-002DCj-3B X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-68-157.hlrn.qwest.net ([192.168.0.21]) [97.122.68.157]:50746 X-Source-Auth: tom+tromey.com X-Email-Count: 28 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEh6lU2S8Qc9Dvukjix0nXcjZUFgwGDWNnrnV3lthZ/RGIXprbi6XPeAZmOKARMUp/PQrAFQjwYmR/bQmIh7dZg74TxUEF50ArP7uku88/JebVgGN4eQ hrAh+RQcpru9L4kq26TaPyFB7xiHy9HfNwk8PNPd/Kdoj51zjcvA2UFR+nGqOProYp18p6Vf1L33OoQ4XcAIuOl5WlyFGwOo2Lk= X-Spam-Status: No, score=-3022.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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+patchwork=sourceware.org@sourceware.org This changes cp_lookup_rtti_type to only search for types -- not functions or variables. Due to the symbol-matching hack, this could just use SEARCH_TYPE_DOMAIN, but I think it's better to be clear; also I hold on to some hope that perhaps the hack can someday be removed. --- gdb/cp-support.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/cp-support.c b/gdb/cp-support.c index 9a59d7632a1..6b7c2f5a062 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -1498,9 +1498,9 @@ cp_lookup_rtti_type (const char *name, const struct block *block) struct symbol * rtti_sym; struct type * rtti_type; - /* Use VAR_DOMAIN here as NAME may be a typedef. PR 18141, 18417. - Classes "live" in both STRUCT_DOMAIN and VAR_DOMAIN. */ - rtti_sym = lookup_symbol (name, block, SEARCH_VFT, NULL).symbol; + rtti_sym = lookup_symbol (name, block, + SEARCH_TYPE_DOMAIN | SEARCH_STRUCT_DOMAIN, + nullptr).symbol; if (rtti_sym == NULL) {