From patchwork Tue May 10 08:45:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 1629038 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=wz/jrqmU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KyCZG3hJNz9sFw for ; Tue, 10 May 2022 19:35:18 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DADBB395441B for ; Tue, 10 May 2022 09:35:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DADBB395441B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652175315; bh=lnJwpZMjfPXYFxJ55FmACIQLYcRMc2JG4xTmlTd0R5E=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wz/jrqmUEDSn0PdLZavvoiHpkacoi+yJHWwYXMOjV5J7I0fL/m3ufpTT/gOkQayZG hGGmFruE/788K2CE0dH0kJNKZFmMoDBc+lls6A0vbVdWR4b5BOGGKQWuXRfJ0O6IYm wRtydKKv4s8euSV6eHaa8A9yhT3uNV9XqkLUBMLk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70089.outbound.protection.outlook.com [40.107.7.89]) by sourceware.org (Postfix) with ESMTPS id C96E53888C71 for ; Tue, 10 May 2022 08:45:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C96E53888C71 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=FsAcfnYfeAjbqpBrCrWcgh05mmdzD4MH+F80LnTU6C8C7Xp387YHYE2lKb5eGiALSnE67EH55Y4nj74LcJEuNNRCxZOCzj858QnqcZ9kCUGgDEEt6083njnGZpNULrUJOtaTJO/XrLco9TdgeMj61zIWu0dIE4sl4srYZuVPak3QY+f4Wi8orq35dMs1/lzjPH1YriYdUwEht92OnTFH8B87LfDrKT4SdqIRAA51yUq5sQl3t3pFLXIe2Re9dCmfhzho8Jo/TBUz23rsxeoMeOzX2DeYShj6OYGJonraaoyuCZtNrdxmlMrAhL7LnH5T/2mb2CEEwXlmdkWZVM71Og== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lnJwpZMjfPXYFxJ55FmACIQLYcRMc2JG4xTmlTd0R5E=; b=L6R8bCQbEd9Jpg034IJRJzUiJcG5zkD9KXfyby4dywhnub9VM1zK0s4ApfcH2QvTO8QQU+drRv5Qshq1YYK+5K0jOG8ALuXVW+GSVpEyoKOe/vq8lkHSE5rsydlrMq3mPhAGoYRfUfZIqTFVisSuH7xnyhTJH4L9kmXA6xgJrwpT3wVd85kmf/pZ4q1okqkDTez+w2DoGrKDV7m1t1BYOu00qwSpPckbh99W7hYejW8G6x25A2KT8gIAIuMK3YXfe1eNqj6ZQT3TJXD03zb3Si27yEZoQbegNP5p102siQlMuxbsX6UzbIe+0tI684+XDVlh2P41gGAcy4Z0Qkx5DA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) Received: from AS8PR07CA0005.eurprd07.prod.outlook.com (2603:10a6:20b:451::32) by AM4PR0802MB2226.eurprd08.prod.outlook.com (2603:10a6:200:59::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Tue, 10 May 2022 08:45:21 +0000 Received: from VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:451:cafe::39) by AS8PR07CA0005.outlook.office365.com (2603:10a6:20b:451::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Tue, 10 May 2022 08:45:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT059.mail.protection.outlook.com (10.152.19.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Tue, 10 May 2022 08:45:20 +0000 Received: ("Tessian outbound ab7864ef57f2:v118"); Tue, 10 May 2022 08:45:20 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ce78d8bfcc7c5ab6 X-CR-MTA-TID: 64aa7808 Received: from 275104f40c4d.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2EFD63B8-04FD-4D14-887B-B9927451D903.1; Tue, 10 May 2022 08:45:14 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 275104f40c4d.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 10 May 2022 08:45:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVmf3a686rBmoxZHpOV9VGI2HzKtFOahcluFkWL6h7WHz9TnJ2lUwFTM8jfU15ImSOLBdqiLkIiIaoDUJf1EGHgHwYHIHE0encNXdtKlyQ+/6M9ZXly3aik4lMO1CNGq/MjY/9muMLiL+y3y5GYEmJM8lXTSZaH/kiBYrxiUvzstsWtXYiH3Xji43o/VtL4EoOCAHfUBq6XE7lhdya9lJ+EHZGPi5l988uSARbrRi8IPPbN8UWGn1Zb+3qIhew/x760acd3EizRLboNQlQAkE1hYHp5HRai3prp5ejeN25HljbkHEJ4zWcSjsoGMMxE4AZh3pZCQ0/cNkVHa4/Q4uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lnJwpZMjfPXYFxJ55FmACIQLYcRMc2JG4xTmlTd0R5E=; b=IHrP3pN6o0AjYwh2Ju3v3NzeV83SJGv6QCJLGnuJD0/mncyk3OB4/PZg2J21vtbJXlF20opAcbIB+NyUOSlRSuTX8a8ayVjTrwCvwmVy7hpYvGJhbulxZ9suVtwZ9yrgppWelm5jCmcNZd4h5t9LzoGqJrKq+Zop7MTFv2THT//hqMauXt+F7PLa+wjzCpDpk4Q0iDi43+ofrZW9AMkC1NX0XyQ1ATbOUPTm24FUaQMqAyr61lP+vDX3mk8Kl8yUbeX0hTrRv3SJSGGrBMMNvsr1rVee5CVvpzLkdCC8FXHgAxiOx8/elIJrpq3OKjc72riuqpn7a43axpJoohlTgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none Received: from AS9PR0301CA0058.eurprd03.prod.outlook.com (2603:10a6:20b:469::17) by DB9PR08MB6746.eurprd08.prod.outlook.com (2603:10a6:10:2a0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Tue, 10 May 2022 08:45:13 +0000 Received: from AM5EUR03FT055.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:469:cafe::a2) by AS9PR0301CA0058.outlook.office365.com (2603:10a6:20b:469::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23 via Frontend Transport; Tue, 10 May 2022 08:45:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT055.mail.protection.outlook.com (10.152.17.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Tue, 10 May 2022 08:45:13 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 10 May 2022 08:45:16 +0000 Received: from armchair.cambridge.arm.com (10.2.80.71) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.27 via Frontend Transport; Tue, 10 May 2022 08:45:16 +0000 To: Subject: [PATCH] aarch64: Fix pac-ret with unusual dwarf in libgcc unwinder [PR104689] Date: Tue, 10 May 2022 09:45:11 +0100 Message-ID: <20220510084511.3930244-1-szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 3ebc0b6a-3900-4f03-70b4-08da32616aba X-MS-TrafficTypeDiagnostic: DB9PR08MB6746:EE_|VE1EUR03FT059:EE_|AM4PR0802MB2226:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: BKz2movgeLd1QeAG5wODrkucmqoVLKnJsoHB0BrQV+ghzsZjRhvhKmhlhBKG2E48aQ267mHX9P9cG6q+OXYf/JN7yz2hyFCdRTqCnqw/MRLkDGwIDyXhun2Z/bMTrgKFytgL9sZ9/MN8EvT2x98LQL1rGqvGsdnffLp6DPQjVi825+1cC4CISRoX8wqptnILB4MG0U4W7zBQjQACYWfI/8RrnQa5bWAt9xrQzh+9qs7GW3GBDlrTS2xkve1N9XK1y9vJHia5AeadG1oytQj1xZZ31sUOntzEEaT4JfD+x5hpjwFBLllI6rXnsSJtScIKf1xt5TMQD1925cUK6SDWW1D+pFYnXl16eg/5PIWzYJxRNOdoe9p49wV0P042KV/E/V3pSYty0Umqwikw97H8/iet9HzbF80vDd5abyXeH/fM4+kM8+1pZTAA4DO9at1nc4b9jppIEnECiW5QWxrBg+W701xf+hAG+eTslSiaVfZZl1FGg24r0wkJOhgEBL4Ae3UsSbbos7nwdiBmzaQWOaE0coxM4j+xej7cLS654XiUXAbn875wnmrwCRaynPrRX5xrnsqgCi9FR0UwlY1SX6w2FS427TL2BbD18cFe8eBamj2k/SFSmrX3MJy844qWA6lt6AD1Z83FoY/Ti50YdXXqWL+fGHQhbj4+oACXl2v1TyGgHOYwGdFch4FJKssDZlCTeS0FrQEW+/5M8s8EBVLca6UYxrZpBYjcRdjuBjsxbg2JQLKqHaKLN3uNZrHusGB/rvcHDhtL4qO9aAS9j/hqKm4rQgEjpYyU5y+Ay3U= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(70206006)(356005)(336012)(426003)(70586007)(8936002)(83380400001)(6916009)(44832011)(26005)(47076005)(1076003)(316002)(36756003)(82310400005)(186003)(8676002)(5660300002)(2906002)(40460700003)(81166007)(36860700001)(84970400001)(7696005)(86362001)(508600001)(6666004)(2616005)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6746 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6031cb6f-bc30-45b7-0952-08da32616626 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y4HrWMlzAtuvaR0aIXObLATUUROkjNTiHwTYtJ2M4gsvEO2Zs1ut8JZif1OF/DA+lcNru5xz8qoXo9yiNeiDNODEC6qWuSB0oKmlihM1UC8oJ05WN95YrvlHQXQoofY0ArOSnK0HfLLjADRDS6Tnboy/3qBrpDjhxM5FryOlwISZ+aQT3rhp+HiZCFxkBUfeR/wmz9v4V1uw8o/LPPDdaUnt7HvuKcb/sRelQpUP6gwDBJ7YpSMSrwMv9WAgfHtZRHzGTeskETmBkjcpObMyYFfN6E1X/T9xOTT+ZC20/01nXMox3yosHAlQ1bNYWxXeBuTWrUAN5BE6rU7ck2g60Zl3rUVmWkvvQWOUrCWY5KXRsMGR+bg700w2JytD2Aj3GE1S/RCNiEPzVSH6y9hW0QO/E7NTj0V/2P3p8/5202/YykdOc4lg7b9CYu+lJb4sTYvci6YTL15vxhiUvexA1QnkjxeulWe3Ky/bHE/Nrxbh37xKlmPm7JDZzC3p7Tcrn/mMQeuyyasmNlSLgl6ZvyB6EUSNp2LNMpNkoXwPH0Jem485qlq5lFGQWCEzgH1XTnig04D+aNZOF8vruK8iYupGohoLs6PaN6t50TF6iaSHxWx9cQZKdwAcGiveiELFwrCTztwN5hkyaJ0D3XyTkkg5QqOB4MSPhrruHjEAxMRZ3C6+lTRhZ/MC0UOyHkgJik0LGlTTbxq4kkyb1FH64Us9pLg24++kKhZ4aIT6IEwYANhUmCW5PU2ehQ/03YVVZq5+qxRy2SgfISTFNJuwLA== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(26005)(36860700001)(2616005)(40460700003)(82310400005)(6916009)(8676002)(36756003)(1076003)(47076005)(186003)(426003)(336012)(316002)(70586007)(70206006)(84970400001)(2906002)(5660300002)(6666004)(86362001)(508600001)(7696005)(8936002)(81166007)(83380400001)(44832011); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 08:45:20.9128 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ebc0b6a-3900-4f03-70b4-08da32616aba X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0802MB2226 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Szabolcs Nagy via Gcc-patches From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The RA_SIGN_STATE dwarf pseudo-register is normally only set using the DW_CFA_AARCH64_negate_ra_state (== DW_CFA_window_save) operation which toggles the return address signedness state (the default state is 0). (It may be set by remember/restore_state CFI too, those save/restore the state of all registers.) However RA_SIGN_STATE can be set directly via DW_CFA_val_expression too. GCC does not generate such CFI but some other compilers reportedly do. Note: the toggle operation must not be mixed with other dwarf register rule CFI within the same CIE and FDE. In libgcc we assume REG_UNSAVED means the RA_STATE is set using toggle operations, otherwise we assume its value is set by other CFI. libgcc/ChangeLog: PR target/104689 * config/aarch64/aarch64-unwind.h (aarch64_frob_update_context): Handle the !REG_UNSAVED case. * unwind-dw2.c (execute_cfa_program): Fail toggle if !REG_UNSAVED. gcc/testsuite/ChangeLog: PR target/104689 * gcc.target/aarch64/pr104689.c: New test. --- gcc/testsuite/gcc.target/aarch64/pr104689.c | 149 ++++++++++++++++++++ libgcc/config/aarch64/aarch64-unwind.h | 8 +- libgcc/unwind-dw2.c | 4 +- 3 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/aarch64/pr104689.c diff --git a/gcc/testsuite/gcc.target/aarch64/pr104689.c b/gcc/testsuite/gcc.target/aarch64/pr104689.c new file mode 100644 index 00000000000..3b7adbdfe7d --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr104689.c @@ -0,0 +1,149 @@ +/* PR target/104689. Unwind across pac-ret frames with unusual dwarf. */ +/* { dg-do run } */ +/* { dg-require-effective-target lp64 } */ +/* { dg-options "-fexceptions -O2" } */ + +#include +#include +#include + +#define die() \ + do { \ + printf ("%s:%d: reached unexpectedly.\n", __FILE__, __LINE__); \ + fflush (stdout); \ + abort (); \ + } while (0) + + +/* Code to invoke unwinding with a logging callback. */ + +static struct _Unwind_Exception exc; + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + printf ("%s: CFA: %p PC: %p actions: %d\n", + __func__, + (void *)_Unwind_GetCFA (context), + (void *)_Unwind_GetIP (context), + (int)actions); + if (actions & _UA_END_OF_STACK) + die (); + return _URC_NO_REASON; +} + +static void force_unwind (void) +{ +#ifndef __USING_SJLJ_EXCEPTIONS__ + _Unwind_ForcedUnwind (&exc, force_unwind_stop, 0); +#else + _Unwind_SjLj_ForcedUnwind (&exc, force_unwind_stop, 0); +#endif +} + + +/* Define functions with unusual pac-ret dwarf via top level asm. */ + +#define STR(x) #x +#define DW_CFA_val_expression 0x16 +#define RA_SIGN_STATE 34 +#define DW_OP_lit0 0x30 +#define DW_OP_lit1 0x31 + +#define cfi_escape(a1, a2, a3, a4) \ + ".cfi_escape " STR(a1) ", " STR(a2) ", " STR(a3) ", " STR(a4) + +/* Bytes: 0x16 0x22 0x01 0x30 */ +#define SET_RA_STATE_0 \ + cfi_escape (DW_CFA_val_expression, RA_SIGN_STATE, 1, DW_OP_lit0) + +/* Bytes: 0x16 0x22 0x01 0x31 */ +#define SET_RA_STATE_1 \ + cfi_escape (DW_CFA_val_expression, RA_SIGN_STATE, 1, DW_OP_lit1) + +/* These function call their argument. */ +void unusual_pac_ret (void *); +void unusual_no_pac_ret (void *); + +asm("" +".global unusual_pac_ret\n" +".type unusual_pac_ret, %function\n" +"unusual_pac_ret:\n" +" .cfi_startproc\n" +" " SET_RA_STATE_0 "\n" +" hint 25 // paciasp\n" +" " SET_RA_STATE_1 "\n" +" stp x29, x30, [sp, -16]!\n" +" .cfi_def_cfa_offset 16\n" +" .cfi_offset 29, -16\n" +" .cfi_offset 30, -8\n" +" mov x29, sp\n" +" blr x0\n" +" ldp x29, x30, [sp], 16\n" +" .cfi_restore 30\n" +" .cfi_restore 29\n" +" .cfi_def_cfa_offset 0\n" +" hint 29 // autiasp\n" +" " SET_RA_STATE_0 "\n" +" ret\n" +" .cfi_endproc\n"); + +asm("" +".global unusual_no_pac_ret\n" +".type unusual_no_pac_ret, %function\n" +"unusual_no_pac_ret:\n" +" .cfi_startproc\n" +" " SET_RA_STATE_0 "\n" +" stp x29, x30, [sp, -16]!\n" +" .cfi_def_cfa_offset 16\n" +" .cfi_offset 29, -16\n" +" .cfi_offset 30, -8\n" +" mov x29, sp\n" +" blr x0\n" +" ldp x29, x30, [sp], 16\n" +" .cfi_restore 30\n" +" .cfi_restore 29\n" +" .cfi_def_cfa_offset 0\n" +" ret\n" +" .cfi_endproc\n"); + + +/* Functions to create a call chain with mixed pac-ret dwarf. */ + +__attribute__((target("branch-protection=pac-ret"))) +static void f2_pac_ret (void) +{ + force_unwind (); + die (); +} + +__attribute__((target("branch-protection=none"))) +static void f1_no_pac_ret (void) +{ + unusual_pac_ret (f2_pac_ret); + die (); +} + +__attribute__((noinline, target("branch-protection=pac-ret"))) +static void f0_pac_ret (void) +{ + unusual_no_pac_ret (f1_no_pac_ret); + die (); +} + +static void cleanup_handler (void *p) +{ + printf ("%s: Success.\n", __func__); + exit (0); +} + +int main () +{ + char dummy __attribute__((cleanup (cleanup_handler))); + f0_pac_ret (); + die (); +} diff --git a/libgcc/config/aarch64/aarch64-unwind.h b/libgcc/config/aarch64/aarch64-unwind.h index 40b22d3c288..e082e957821 100644 --- a/libgcc/config/aarch64/aarch64-unwind.h +++ b/libgcc/config/aarch64/aarch64-unwind.h @@ -78,7 +78,13 @@ static inline void aarch64_frob_update_context (struct _Unwind_Context *context, _Unwind_FrameState *fs) { - if (fs->regs.reg[DWARF_REGNUM_AARCH64_RA_STATE].loc.offset & 0x1) + const int reg = DWARF_REGNUM_AARCH64_RA_STATE; + int ra_signed; + if (fs->regs.reg[reg].how == REG_UNSAVED) + ra_signed = fs->regs.reg[reg].loc.offset & 0x1; + else + ra_signed = _Unwind_GetGR (context, reg) & 0x1; + if (ra_signed) /* The flag is used for re-authenticating EH handler's address. */ context->flags |= RA_SIGNED_BIT; else diff --git a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c index 6ccd8853076..a2eb66dc0de 100644 --- a/libgcc/unwind-dw2.c +++ b/libgcc/unwind-dw2.c @@ -1204,7 +1204,9 @@ execute_cfa_program (const unsigned char *insn_ptr, #if defined (__aarch64__) && !defined (__ILP32__) /* This CFA is multiplexed with Sparc. On AArch64 it's used to toggle return address signing status. */ - fs->regs.reg[DWARF_REGNUM_AARCH64_RA_STATE].loc.offset ^= 1; + reg = DWARF_REGNUM_AARCH64_RA_STATE; + gcc_assert (fs->regs.reg[reg].how == REG_UNSAVED); + fs->regs.reg[reg].loc.offset ^= 1; #else /* ??? Hardcoded for SPARC register window configuration. */ if (__LIBGCC_DWARF_FRAME_REGISTERS__ >= 32)