From patchwork Fri Nov 5 13:55:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 1551393 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=J4sne7X8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hm28p3xn9z9sf8 for ; Sat, 6 Nov 2021 00:55:53 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E27D33857C4C for ; Fri, 5 Nov 2021 13:55:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E27D33857C4C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636120550; bh=V86PWO7bbe4Y+fPQ3l17TDuvXNkz0OY3TrQfmK/4QhQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=J4sne7X8Qsswbq/q5d2hi8UfwL9BZ/vvNzMoUk1bAPJzGwG0VGKwtjjJSoGTw8346 JEe94sWxrHXtyvwnXb9ga6DtfadlOKLucqJFNoItamEi1FkV/eKiOemLIU7n5xtXy7 rSjXGpV36JrV4qPDjnD7rSxrB0VwiAiisYB+eqL0= 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-eopbgr70047.outbound.protection.outlook.com [40.107.7.47]) by sourceware.org (Postfix) with ESMTPS id 4F1003857C4C for ; Fri, 5 Nov 2021 13:55:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4F1003857C4C Received: from DBBPR09CA0039.eurprd09.prod.outlook.com (2603:10a6:10:d4::27) by GV1PR08MB7378.eurprd08.prod.outlook.com (2603:10a6:150:22::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Fri, 5 Nov 2021 13:55:18 +0000 Received: from DB5EUR03FT053.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:d4:cafe::7d) by DBBPR09CA0039.outlook.office365.com (2603:10a6:10:d4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Fri, 5 Nov 2021 13:55:18 +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 DB5EUR03FT053.mail.protection.outlook.com (10.152.21.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Fri, 5 Nov 2021 13:55:18 +0000 Received: ("Tessian outbound c71e1a752bff:v108"); Fri, 05 Nov 2021 13:55:18 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 1fda04e8108be8e3 X-CR-MTA-TID: 64aa7808 Received: from 16936f032fb3.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F02D3F2C-DDC4-42C0-8CCA-B67FD935B4E9.1; Fri, 05 Nov 2021 13:55:12 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 16936f032fb3.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 05 Nov 2021 13:55:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QvKtrkAYDIQI1Ls3ijltpWcJ/hakCW0l2djA2jNIOJtmnkqb4a0i0qP7BPoR2IZZZC07blpRljuzh8TtfWB0TcRoPmSJrdpS9bcj3k3E66yBIFApFrRVqRg8JV1ZdADj7UOaX0W3xXK8IbZTJ8sxJKW+PLVVrCMC+/1UEFzkyZqHeQ8y8J6Ok5/K+0C4k8T8uJasTX3X8Z3bFhhIHeRiqeHyh6dux63JSFVQIZTtgpyJPOFZVUrbEZgI6MhEL/5ON8EtHnW9VPuqEzghKviPvIVSbFAk789rHFCaNZXiarvKyC4iofpccHNzIEfl++rstn4SwOO1QvBUwIfUqsXUTg== 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=V86PWO7bbe4Y+fPQ3l17TDuvXNkz0OY3TrQfmK/4QhQ=; b=FwyWizHwIpe7cnxqlHGs9bWAR7j45imncshW8poO5cPtAsK/Zwk6uMoUhn85433P2rsI43/0DGhnJryVA1jDiEInc0Go/PD7v5MjHsscvtzNJxJvLtStudH3chz1NbNl3P3QDDwv2307N0RJhVzO9qdI8kV9u9qLlhOo2bzdBinFNAEpAVwkudzVIlsu78XS3/QHZFhiGLLjcuCbh906meeVGGY789XKUY5N06rZR5tuihUDE3JXcx17LE0y5vPRq+K2I3rPQ/wmbfPNR8CCOPmpSWo7pCbuZKh4pjkp6JTGJfL32h0SPQF+WrTRZ/nRI8DlEn//fqzTBcV2iOsbQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from VE1PR08MB5599.eurprd08.prod.outlook.com (2603:10a6:800:1a1::12) by VI1PR0801MB1822.eurprd08.prod.outlook.com (2603:10a6:800:5c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Fri, 5 Nov 2021 13:55:10 +0000 Received: from VE1PR08MB5599.eurprd08.prod.outlook.com ([fe80::e49f:f587:130d:78e4]) by VE1PR08MB5599.eurprd08.prod.outlook.com ([fe80::e49f:f587:130d:78e4%7]) with mapi id 15.20.4669.013; Fri, 5 Nov 2021 13:55:10 +0000 To: GCC Patches Subject: [PATCH] AArch64: Fix PR103085 Thread-Topic: [PATCH] AArch64: Fix PR103085 Thread-Index: AQHX0kxSkP6F8yhpIEuL7aZ12jjBYg== Date: Fri, 5 Nov 2021 13:55:10 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: 647d5b02-3e0d-31ec-8623-8635f25443d8 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: b579fb5e-cc35-4ddf-f879-08d9a063e700 x-ms-traffictypediagnostic: VI1PR0801MB1822:|GV1PR08MB7378: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:644;OLM:644; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jJDA0l3S03zUiBxIMJIIgBdu+XyfXp7o44UII3HELKngWQ8c2+YwJNEwluXuPy0yMITPRkmFdIU8tH/ElIHbuUDcqyrDrriXJAUbC1NtM6km0KApplNRMChZo9dghh8OegA6h53wA9js8tvy7Wsa8VO7zSRPB/HX7xK1A2QRTVCNkHKl/K/r/2u5Dk9SWN9nmphIIoOmNYxCXsKn3Rnx1JoCNCT9rvSQ3y2dC7Nogm4ySCYAUmAYhsSf6uMW5JvQb29tBgscBDVUU3l36bLOtl6Tdh3NHDuzVWZVskWT0o8xbA72TLv1jcYR6HMA44zaTxQ6VmMxl2FMUhOZa9SPTrtvSlxjComBP6twiD8UsHVKjTKCCx7OWIseoPuXRkrxSLdE1MM9DV4SbHe8Ho62/KmLMBZr7T3WYy0LXfhj0c0Zsomsg2l0IAnr27p+426q2t4yr31HZX0rlftpYVNahWc8bVkjDx2R99OxHm18qXOw6yHjPB9yjrQRbeU1AIr6cF0QUuBAp0wnd8JnH62FIn09kb/yhtos4Rr+E6FwUqxTy3tsU8Zwi6bYvKkFABGZn9UNr0iElmaayBstjyRObSjzsIKTCQxXf5iZoyYHXvN7a1N3ZynvL/U5UoWjUV006dZk+Tpd7yCKS0UKCMH2mWrjCy/J5B2wOtcUZGrOtpPkd3aFSSXIsD73yNyj9Oi2Nkpe/xZnBe7GKfDZzDhCgHF8roJBIgWaoLMgsGSrizKgiD40sOIpBWG6JadqSrSAur6V3cIrAL8/ygUEj8KlcR/gO9DxR4nUIHbTkx8f0es= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR08MB5599.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(86362001)(55016002)(71200400001)(186003)(9686003)(91956017)(38070700005)(64756008)(66556008)(8936002)(52536014)(5660300002)(66476007)(66446008)(76116006)(2906002)(33656002)(4326008)(6916009)(26005)(122000001)(6506007)(38100700002)(8676002)(316002)(508600001)(54906003)(83380400001)(7696005); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1822 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT053.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: da8cf7d8-7662-4a96-75e8-08d9a063e201 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k35/CpEtsNnnqRV2lsZ8YTBC0JEN5VtmC/54B3R9tGEXgR8iwa/dfze0hAIgcnHNDz0zhzUq8dxtQTxkPPaNMZHIDFUUHek2CMNGkiQw3q0XsJ3B85kM+nm+DWGf/me6B+JjsOY9J+RxyANToopskuWui63bnN6PK9iXHUPduSTm/J0NF0pw+0zMifDNmbzGHUx3NGvYHvSXiYZSWk4M08iIvjYconXO144jf/1zANQ+A7AIf5CrNkiNaZNMS86c+ajb8TlrLI6L0c5+RqDfcVdMdAl1GmZSzhnbJnf0BDa0Do6/V5Zqc9lGwgcB+EAKtdjl+iqL2yH74WvQzMnfJ305cA5/1rmztGwW4544VNsniBayQGiLQCrx9oAT2nc6sbxXav9RoAIr68XRKQPP3CUwHj6KNggu0dnnDWbawLsCC2oukY2Bqxm1VlDwREvWgLxa5jtVK5BLovfR7b2n4yNXigD5fHA6iB7tr4L8TF/vBwfVO3XUKivxMRHTMvHfFRKj4qRP5mw+4XBEcHKAWlkQ16C7/fTlKhBjoEr4eifZfVKY0YdEYhyOHepOWumPOsYF0RS2GLcUIeMRZEc+033Ac3r8zrpgmbVfBAnviX4Jjtrpu25wJuhD8x+nJYyA7GFXp7zyjs4GDIzOe8aBoh/i++eKAwniokcyZOpDCy1Eg/FaNuamCFS0ZVnYuLuxq5wIkYPZhiJtviF6q4e3lXLQIvjRDyb5TZIu+v6RYoIJvE2BxQrXhwGGH1I7/3hFuRadYustIsWu7l6OTrI5HkRW/r3lT9ka6SZncDIbOXA= 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:(4636009)(46966006)(36840700001)(356005)(33656002)(47076005)(8676002)(5660300002)(6506007)(6916009)(52536014)(508600001)(70206006)(83380400001)(2906002)(54906003)(81166007)(316002)(82310400003)(8936002)(186003)(336012)(86362001)(55016002)(7696005)(36860700001)(4326008)(70586007)(9686003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 13:55:18.7372 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b579fb5e-cc35-4ddf-f879-08d9a063e700 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: DB5EUR03FT053.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7378 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_NUMSUBJECT, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, 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: Wilco Dijkstra via Gcc-patches From: Wilco Dijkstra Reply-To: Wilco Dijkstra Cc: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The stack protector implementation hides symbols in a const unspec, which means movdi/movsi patterns must always support const on symbol operands and explicitly strip away the unspec. Do this for the recently added GOT alternatives. Add a test to ensure stack-protector tests GOT accesses as well. Passes bootstrap and regress. OK for commit? 2021-11-05 Wilco Dijkstra PR target/103085 * config/aarch64/aarch64.c (aarch64_mov_operand_p): Strip the salt first. * config/aarch64/constraints.md: Support const in Usw. * gcc.target/aarch64/pr103085.c: New test diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 430ea036a7be4da842fd08998923a3462457dbfd..39de231d8ac6d10362cdd2b48eb9bd9de60c6703 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -20155,12 +20155,14 @@ aarch64_mov_operand_p (rtx x, machine_mode mode) return aarch64_simd_valid_immediate (x, NULL); } + /* Remove UNSPEC_SALT_ADDR before checking symbol reference. */ + x = strip_salt (x); + /* GOT accesses are valid moves. */ if (SYMBOL_REF_P (x) && aarch64_classify_symbolic_expression (x) == SYMBOL_SMALL_GOT_4G) return true; - x = strip_salt (x); if (SYMBOL_REF_P (x) && mode == DImode && CONSTANT_ADDRESS_P (x)) return true; diff --git a/gcc/config/aarch64/constraints.md b/gcc/config/aarch64/constraints.md index 70ca66070217d06f974b18f7690326bc329fed89..da5438e7ce254272eb10e9ac60d5367c46635e84 100644 --- a/gcc/config/aarch64/constraints.md +++ b/gcc/config/aarch64/constraints.md @@ -152,10 +152,11 @@ (define_constraint "Usa" (match_test "aarch64_symbolic_address_p (op)") (match_test "aarch64_mov_operand_p (op, GET_MODE (op))"))) +;; const is needed here to support UNSPEC_SALT_ADDR. (define_constraint "Usw" "@internal A constraint that matches a small GOT access." - (and (match_code "symbol_ref") + (and (match_code "const,symbol_ref") (match_test "aarch64_classify_symbolic_expression (op) == SYMBOL_SMALL_GOT_4G"))) diff --git a/gcc/testsuite/gcc.target/aarch64/pr103085.c b/gcc/testsuite/gcc.target/aarch64/pr103085.c new file mode 100644 index 0000000000000000000000000000000000000000..dbc9c15b71f224b3c7dec0cca5655a31adc207f6 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr103085.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fstack-protector-strong -fPIC" } */ + +void g(int*); +void +f (int x) +{ + int arr[10]; + g (arr); +} +