From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YSpqGKc2Ymo/9CkAWB0awg (envelope-from ) for ; Thu, 23 Jul 2026 11:43:35 -0400 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=OCzNhx6F; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 47A1A1E09E; Thu, 23 Jul 2026 11:43:35 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 769A31E033 for ; Thu, 23 Jul 2026 11:43:34 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C00764BA2E3B for ; Thu, 23 Jul 2026 15:43:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C00764BA2E3B Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=OCzNhx6F Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id 4C4514BA2E12 for ; Thu, 23 Jul 2026 15:43:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C4514BA2E12 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 4C4514BA2E12 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::333 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784821389; cv=none; b=D3NXK+UG2qkrvM064bKXmllNTuFr+qiRLdVW6jI82Rhx5Ia9ZMoReLu3bubLgrgcRJqblsWd0OYhyafhl7Jq4zvmKZ+jWfgFuAmbvr34jxS+oC4deJYLEXbkZrngs3URqj1AqUAwNk+F8bvB2QTuenUBUHDouLZZZcnadlGkDTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784821389; c=relaxed/simple; bh=G5kJQHpQvXqYWuxaAg143ottsOlBSzo3XhbiYvAtyHc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=YSap5wIx4PFME7yMNeKd6EPe6Vl54xjKVwDo3NcnAn/1hpiJ1+yOzOecl9ZLTse6ziHSta+IKP0Zh16SiT3zs0rMgFRA2hC3HTpk+b/mRbGPw6CXg4Zj98bWRaM6dBof91IV9Q/OR4emIErWHIsmXGAv3sAsl74FJYwtwFsR6kU= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=OCzNhx6F DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C4514BA2E12 Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-7eb6573bd52so484421a34.3 for ; Thu, 23 Jul 2026 08:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1784821388; x=1785426188; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=ULs2wNYPt5fIivK6YHH0vUL+eILoq+PrG36g5NFaNXY=; b=OCzNhx6F3tw+Aha5krLNx0IO2/76aMR+Ce3QbRVH4m40/VitPjGY62IpPmBjDAOMSH yHUv6s36JDxh3D4vDBqmBrNiuTwUl3URW0P3PhpTCOyankCUNVg1JHxod5fYAgpccvNP xrn9f3jOc78mVplK3U/OFzPoRBzfOIUxfcZ3qOEik+fmytlEyk7r5ysizGbeCX2yKndm qy73f5NBY0uzw3vM1MuzjZpdQ8/Unpxnvjf+PE3MA+jPZprGZMF3iMoWVJND9WZ7pghU I8DFzxXZrdYZ+sa3a/fvER5YzaYZGalZ6cZNG+jD87pLNqn0/9d3xkDn4gTha81ER9De vT8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784821388; x=1785426188; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ULs2wNYPt5fIivK6YHH0vUL+eILoq+PrG36g5NFaNXY=; b=hRBa8AY7+xe1TOXlEr1IplEpJsfpzNmjmR5Rsz0lDxGceCMrq5g6imEz0fZysmmM6R DXwKSAx9BrV0Z/yNQLqxF7oq2gvh+E3YnTrUappOn0Nx6NkWaSyDgUa4AXHNjcf3ghQV tU+H4ZxFT6CWS4Cn7yPU4V84thL+lj1EG63o70tM3g7FFZVQ35P5PE7dCqgWlFJi31Ju 50YwFyn5O02wZuq18E6t1bqbC18Q3/wG0Ogh8pqrY6eEz01ZCOKi5MSDe0kZbBuV8mQ/ gZaFAFgzRur0g/80iBz0bGUeOJwyfvTK5o+xY0+hOdhiaS/y5fCOCIWFFFbNJwPbvXGZ ZzfA== X-Gm-Message-State: AOJu0YyttHUVIdqW3ys5bs7PaeX11tu0VvYaP4dYXyf4mbQOWs4DkS6C nKY3zOjeSZ1lNBnHBjN/rkYHmuir1hbhjXZI/iY+3UjnWAY+c02Rba9LX5PjG+dpolm3MxSdIoU mXzU= X-Gm-Gg: AR+sD10uyQl+lZubMU0A9gsaLwy721HL7ppo/dLsqcrlM5Z055bZCjpYZ0+dXtO+V9A Z7gvisEMsMD9Ihc85Wo/InTqM1I25UKag56u2AYQmWNb5QKfiwHNlhWvtgLVRk1h1UMfPhQGtzq YljwiBQv3jArd5HQIU1ypjOhk1JdQ3y4Qw/x/uWS9Rwri5o3+iwKEyWj0VhkYDuO4JMPPTu1bhE /Oz3AR3fB9Q1auc1CFl+iHurFIZKyWgz3uA26Iq+nZGqNoRMpiOiwH7GWNO5CU0XzR1Lv54BWdx kSjOU8haIXC6Ftj0RuemqaiuheTK65cVA5MihjtYkcrvbVk5JuTGuPpkRSxKtTcNyyvV3+inJRc 2CaYAmF0jdYVnYRGmo1+llGrEbIQ2sLX+B2ZVxQy99M2G1C0NxXL0bzVEdMQrf9ZqPxFymgJ79b LXQdb1THGT+uXCZjxSW1mdvcg+dBIb5hnm X-Received: by 2002:a05:6830:3102:b0:7e9:b4d0:df76 with SMTP id 46e09a7af769-7ee43eb32d1mr1785366a34.30.1784821388582; Thu, 23 Jul 2026 08:43:08 -0700 (PDT) Received: from bapiya (75-166-225-82.hlrn.qwest.net. [75.166.225.82]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ee29e0f876sm3733918a34.7.2026.07.23.08.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 08:43:08 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Simplify ada_parse_renaming Date: Thu, 23 Jul 2026 09:43:06 -0600 Message-ID: <20260723154306.3708516-1-tromey@adacore.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 While working on gnat-llvm, I found that ada_parse_renaming checks the "loc_class" of the symbol. This caused a problem with my WIP gnat-llvm patch, which emitted a renaming symbol as LOC_CONST. I've since fixed my gnat-llvm patch; but nevertheless it seems to me that there's no need to check this. In Ada, no user-provided symbol will have an "___XR" substring, as such symbols are all lower-cased. This patch removes the check, simplifying ada_parse_renaming. --- gdb/ada-lang.c | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a7019a4522c..d948c68a012 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -4400,43 +4400,33 @@ ada_parse_renaming (struct symbol *sym, const char **renaming_expr) { enum ada_renaming_category kind; - const char *info; const char *suffix; if (sym == NULL) return ADA_NOT_RENAMING; - switch (sym->loc_class ()) + const char *info = strstr (sym->linkage_name (), "___XR"); + if (info == nullptr) + return ADA_NOT_RENAMING; + switch (info[5]) { + case '_': + kind = ADA_OBJECT_RENAMING; + info += 6; + break; + case 'E': + kind = ADA_EXCEPTION_RENAMING; + info += 7; + break; + case 'P': + kind = ADA_PACKAGE_RENAMING; + info += 7; + break; + case 'S': + kind = ADA_SUBPROGRAM_RENAMING; + info += 7; + break; default: return ADA_NOT_RENAMING; - case LOC_LOCAL: - case LOC_STATIC: - case LOC_COMPUTED: - case LOC_OPTIMIZED_OUT: - info = strstr (sym->linkage_name (), "___XR"); - if (info == NULL) - return ADA_NOT_RENAMING; - switch (info[5]) - { - case '_': - kind = ADA_OBJECT_RENAMING; - info += 6; - break; - case 'E': - kind = ADA_EXCEPTION_RENAMING; - info += 7; - break; - case 'P': - kind = ADA_PACKAGE_RENAMING; - info += 7; - break; - case 'S': - kind = ADA_SUBPROGRAM_RENAMING; - info += 7; - break; - default: - return ADA_NOT_RENAMING; - } } if (renamed_entity != NULL) base-commit: 39fc0cc4aa6f82a73b9eac6b8739895484ab269f -- 2.55.0