From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EbKdHSFng2p6di0AWB0awg (envelope-from ) for ; Mon, 17 Aug 2026 15:55:13 -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=hrDreXwk; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 763881E09B; Mon, 17 Aug 2026 15:55:13 -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 B19C41E09B for ; Mon, 17 Aug 2026 15:55:12 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4CE594BAE7D7 for ; Mon, 17 Aug 2026 19:55:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CE594BAE7D7 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=hrDreXwk Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 768954BA79A7 for ; Mon, 17 Aug 2026 19:54:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 768954BA79A7 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 768954BA79A7 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786996489; cv=none; b=ELni1slQpAzikvpK+Hf/UKABXgK5OCWjEyWGH+4JPB3E1z7eK5oZL3q2SoQmGLUx7lezDkWDAUjn0GlS4kSzBBdH08+0vwljQcvcK4ceD0puqdUJUZercOG7vK3Ev4GnevwW6Qy8YbmmQ+w+WQGUxhZsYqiVHsZeqBqIX6zJ6Cw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786996489; c=relaxed/simple; bh=V55djGx23XZr1BmxGNUDhP2hEo6YLNEUyEJNQLUHh8Y=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kbC8EywUGwgJCulx6ntxpbqqYIA8ZMsHuItgR8NSXDINBayi9iUD8wi4QcH5VWPt2sM+pqt90hvPvTr4QNML0Ev+NFRT2wWlxe2OLMFaMo9RILDZlimhffDCtCKMDW1ooUl+1MsQghnsTxzv415rMj7FFfRhMFN5az92Wnk9ye0= 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=hrDreXwk DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 768954BA79A7 Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-7f3b2c92428so1493107a34.0 for ; Mon, 17 Aug 2026 12:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1786996489; x=1787601289; 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=P+ScuRUZldljhp931a2rP23HKa1mC8VaVRFO1smHUzk=; b=hrDreXwkCm2fC9e6RZAxB6NBHhJvuXzmrncUYt6BHtRpdKPeH+cWzw/XZHI9uUxaTt fE2Of/27gapFvCgfJXQXxr+plnS2gcCjRum4kkRC1CzsM2qw6rlxCCGQK0SwMl1xXhiv 4V9nf3oqsJsLWFVy8Y3OjQLyVJGOLvZjGqnqbeYzt1afo0Er3trqVgskLuczUJTS5P9W Rbo3jPneWQ1qScqe33mJ8RsPewRBXaGJyQvUxrrT+CPFVLpzAAn0xOxo1P4Bkk7uOFkF jAajQJw/GnGqSXCZXkCz07l704cSgPEbNMS3jjK2JZbCeUFMTON44jODC/MKB/cNyGrJ lvzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786996489; x=1787601289; 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=P+ScuRUZldljhp931a2rP23HKa1mC8VaVRFO1smHUzk=; b=G9kTDR7pWN6xqEwq9MLGAgV93wpR42nej8Nmsyk7rtJMXJw4qRKS3YmQkKut9yEuJF 6PcArTRchF35CUQLBtndc0IEA7zAidjYR9aJZqqgXq4dfE9C8Kb8sB2HdhinfYSeZWKc UfTMUMqUhxqtvsPn96i0cJpqIN0fGcT9sZJUdyGTVwJstxc+EkyDqe+5KKrVrE8K9Mn5 //AhTFZTQ4r23+lnffHq4xSBAjtHotsWBngmmvHV0URZVNAterA34espTbwgXznr635N 5B6XKswoottx1P0xZ5Xf9tZzc4rpQfZj9y9TXyVYBq7EyLmneErOEq0xA05s/sEOyptc Gz7w== X-Gm-Message-State: AOJu0YwYDLxGaA2Yf+Hnm5aef3z2iM0k85pO/jV67s9tLVboMzioEEHc xXo9J6HFjLETD4Pt919x6AoecPjo7N8FBpmj+HmQnbRRDykZj1BawQHvhZEIdDdSCci50W961BX oNpU= X-Gm-Gg: AR+sD11QmZrQ8gAsWkXx3qskShm5HAEC3ZYIFa4obwXzOqetPgJc9H1YLG2wsBkZw6W btSTkWWU1cnygorcyiWTyAkfDG+js6vP9yNSci/JOzZCHQjEwriX5TVGrqqeTdOOh7z449VtV5O BM+RMlkmLY24/Ku4e3/BYZOU3D/9z8TicGX+hwTF2wMIpxAwPLNQqxz9TmwTvwNEmkWI5csAiUh lbRdfSc+gnuuMGgPiqd/upwSy4R5mvWEwWA67G8OucdAQoB6me9f4djsgHsi9HdiaW9F8zWh3mf lmhilgFb+AAzCsHp1e0nQhGAXGfhhSsuKtjCZL3b4chnlPrmhXsJ/rTNGAzahZQih4RdLwQ7sj8 FVXTq/h+jNDSmAaiz1poUGm+Lf3zhki/BAWxgrevh4Ul07hDdWfaWJLnu0jrNE125smERPgv9m1 bYw/GTJ3ts8gc414nisBSNXfNkJhN9zsJuKRMAd6GOTwJHeQLar4LO79UcV8XumdTbLnRICFh5x +pl0BmW X-Received: by 2002:a05:6830:2318:b0:7dc:e090:68a with SMTP id 46e09a7af769-7f42395c164mr3123770a34.0.1786996488743; Mon, 17 Aug 2026 12:54:48 -0700 (PDT) Received: from bapiya (75-166-225-82.hlrn.qwest.net. [75.166.225.82]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7f41c12db75sm2284494a34.27.2026.08.17.12.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 12:54:47 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Update gdb.ada/unchecked_union.exp for gnat-llvm Date: Mon, 17 Aug 2026 13:54:42 -0600 Message-ID: <20260817195442.996856-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 gnat-llvm emits a slightly different encoding for Ada unchecked unions. In particular this will let gdb show the discrminant for some branches of a union which currently cannot be seen in GCC's output. This patch updates gdb.ada/unchecked_union.exp to allow this. --- gdb/testsuite/gdb.ada/unchecked_union.exp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.ada/unchecked_union.exp b/gdb/testsuite/gdb.ada/unchecked_union.exp index 6a54e606712..ef9da787e65 100644 --- a/gdb/testsuite/gdb.ada/unchecked_union.exp +++ b/gdb/testsuite/gdb.ada/unchecked_union.exp @@ -24,20 +24,23 @@ standard_ada_testfile unchecked_union proc multi_line_string {str} { set result {} foreach line $str { - lappend result [string_to_regexp $line] + lappend result [quotemeta $line] } set res [multi_line {*}$result] verbose -log "RES: '$res'" return $res } +# Note the quotemeta expression here. gnat-llvm emits slightly a +# different encoding here, which lets gdb see the discriminant for a +# branch. set inner_string \ [list \ " case ? is" \ " when 0 =>" \ " small: range 0 .. 255;" \ " second: range 0 .. 255;" \ - " when ? =>" \ + " when @/\[1?\]/ =>" \ " bval: range 0 .. 255;" \ " when others =>" \ " large: range 255 .. 510;" \ @@ -50,12 +53,15 @@ set inner_full \ $inner_string \ [list "end record"]] +# Note the quotemeta expression here. gnat-llvm emits slightly a +# different encoding here, which lets gdb see the discriminant for a +# branch. set pair_string \ [list \ " case ? is" \ - " when ? =>" \ + " when @/\[0?\]/ =>" \ " field_one: range 0 .. 255;" \ - " when ? =>" \ + " when @/(\\?|others)/ =>" \ " field_two: range 255 .. 510;" \ " end case;"] base-commit: 0f9faaebc91bc1886a563bde6c178601b4be743b -- 2.55.0