From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id MMi+IJocXWUxCwwAWB0awg (envelope-from ) for ; Tue, 21 Nov 2023 16:09:46 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=ScXF2dTo; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 839D01E098; Tue, 21 Nov 2023 16:09:46 -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 70AD21E0D2 for ; Tue, 21 Nov 2023 16:09:44 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 09D6138582A8 for ; Tue, 21 Nov 2023 21:09:44 +0000 (GMT) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by sourceware.org (Postfix) with ESMTPS id CA7593858D38 for ; Tue, 21 Nov 2023 21:09:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CA7593858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CA7593858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700600970; cv=none; b=oiWYU920UfOEmFi+r4WA4M/x8s1fiDcqPR4BnMwiWUB3kndUgMyG33kGNB3LNTNCav3+F3XKPkV0XlayrEvG3+jS4L9SwtsX3G7q3v+1g9UbqPoE/SkhGlKSrwobOEMiCl5baWP9wHWMs8eAPq1LABvvu1l3dVXVcFQu7HUyUqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700600970; c=relaxed/simple; bh=hkFK0QmCWlVniHf2Cai0UWX4faFs5LrWkDz8YT1umgo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=PInZ1FScMHetQx/wvrASDazQWcO63l8+HRaKP3sGmlDcZY1nnXl3+sKLUVk1GXLNthDSHu9WZqyJnUkBbI0E1EeVPHZvHmJXMz2IVhgl+VoOEB2ARXkXAgOJV4oPHcNV2Hk92TDeYbtVzcU57mS532ajShiUUcwx+2zV2kLk2OY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-7a98fdeaac7so240474139f.1 for ; Tue, 21 Nov 2023 13:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1700600968; x=1701205768; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=+kh3oqh1prb3qGkBPvBG6AEQMpN4UrXr5PGTBgGkJMw=; b=ScXF2dToFT6bTAhZZV7eoB26gKw9+WrroaV+AqnmntVhxZLMQ+YieXPGQAUvMQyQeM 7DO/ZO1nZS8NecJscSnm0j8e7XeXng432fLcOTPTSGJUxVahod4iWXV8eJJDcBejevyJ WsQucD/+zPtKauyMbmlrs07iv/oHiNh+w8nJ7gEZEfyODau4Qx9jwF5KC421ecmJBfuj kA+Zsr1zlao0aqXFcepu9brflI27a7F11cPBfa1M5DK8g4yuLzOZ5GW4R7HzZuTy7yh1 h5guGKtqpj4yZdCgePG4rU80etqCxkncFSYZ/6cfZz1f/DCOL//hUPIxIeK13VZjZpcc 1Caw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700600968; x=1701205768; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+kh3oqh1prb3qGkBPvBG6AEQMpN4UrXr5PGTBgGkJMw=; b=CFXBODXHg3TF83ljPCQgFYHFMgaUQg/GEAkNORIkWIxr/MRZnWqRNHNDdfn2KXfkt3 zkFO0vDpa5kIymYctnraqRUxTdQQURDsYHj6ClRg9CgH4eCs9HiM72BRqe62nfsU9tEa Ck5UvjzWj2AOLpivv3r1gbLicmD5CTXqCuF1ZbOiY7wdqdQ9akEGJaAEq4iQUQhdxFpb CDGikV4l2jsMb+W12Ips9nozdxUQw+ENUM7g8FFL8YTykW0oWeShFH8p5uiMb7Bw988C nFtaZy/kZzx7WHGz8Gd5Z5FrDv2+zMFCionTV+SxCq0RRjS4TWA9wgr5+kqVzCWs3a3p b8UA== X-Gm-Message-State: AOJu0Yy7uckbl8+wxP6QIFtmzhQn4WE5v1rIA8rNalL37md1RK6PICNn h2ZONfZgc0FyN2QNhqtxJbqSG5eE16X6vKjeMPSvXQ== X-Google-Smtp-Source: AGHT+IEQoafrZr1+CBhpvRofQdSsRTemy7c5AAH0Rnse944rPtcLYwYx5Y2mIS0lwCVssGKEn7seFQ== X-Received: by 2002:a05:6602:c82:b0:787:8cf:fd08 with SMTP id fp2-20020a0566020c8200b0078708cffd08mr100619iob.17.1700600967934; Tue, 21 Nov 2023 13:09:27 -0800 (PST) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id l14-20020a6b750e000000b0079f7734a77esm3050242ioh.35.2023.11.21.13.09.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 13:09:27 -0800 (PST) From: Tom Tromey Date: Tue, 21 Nov 2023 14:09:27 -0700 Subject: [PATCH 3/4] Remove split_style::UNDERSCORE MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231121-ada-lookup-perf-v1-3-1efd2d1dbf65@adacore.com> References: <20231121-ada-lookup-perf-v1-0-1efd2d1dbf65@adacore.com> In-Reply-To: <20231121-ada-lookup-perf-v1-0-1efd2d1dbf65@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.7 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 The recent changes to the way Ada names are matched means that split_style::UNDERSCORE is no longer used. This patch removes it. --- gdb/split-name.c | 13 ------------- gdb/split-name.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/gdb/split-name.c b/gdb/split-name.c index 0805cb82700..4ef022cf58e 100644 --- a/gdb/split-name.c +++ b/gdb/split-name.c @@ -45,19 +45,6 @@ split_name (const char *name, split_style style) } break; - case split_style::UNDERSCORE: - /* Handle the Ada encoded (aka mangled) form here. */ - for (const char *iter = strstr (name, "__"); - iter != nullptr; - iter = strstr (iter, "__")) - { - result.emplace_back (&name[previous_len], - iter - &name[previous_len]); - iter += 2; - previous_len = iter - name; - } - break; - case split_style::DOT_STYLE: /* D and Go-style names. */ for (const char *iter = strchr (name, '.'); diff --git a/gdb/split-name.h b/gdb/split-name.h index ad2862e222d..2674c9b8d27 100644 --- a/gdb/split-name.h +++ b/gdb/split-name.h @@ -33,8 +33,6 @@ enum class split_style /* Split at ".". Used by Ada, Go, D. This has a funny name to work around a bug in Bison 2.3, which is used on macOS. */ DOT_STYLE, - /* Split at "__". Used by Ada encoded names. */ - UNDERSCORE, }; /* Split NAME into components at module boundaries. STYLE indicates -- 2.41.0