From patchwork Fri Apr 30 15:18:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinath Parvathaneni X-Patchwork-Id: 1472367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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@gcc.gnu.org; receiver=) Authentication-Results: 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=yRQx9U5u; dkim-atps=neutral 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 (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FWx4X5ysxz9sXM for ; Sat, 1 May 2021 01:24:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 66E133A53034; Fri, 30 Apr 2021 15:24:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66E133A53034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1619796281; bh=giQBuV6Hj5KQd20MPokNLgBVA/ZXmfa+pyABnlrs7uQ=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=yRQx9U5up8Cqr2RYP9ohNBzUe/7MAR1Xrpptv89CYWfDHeDQjb76ySCueWg0fM/Xk h28hllLAlE2BgwMH1OsQ87XtIR2ATq0iOQiHmeGjfNxoEbaAdM98/AV4Xf6sagi1RN NWFhWMv2T5r8db4BgR7SmDW8KyVeQ1i7+u2UISRg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80051.outbound.protection.outlook.com [40.107.8.51]) by sourceware.org (Postfix) with ESMTPS id 7F7D83854838 for ; Fri, 30 Apr 2021 15:24:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7F7D83854838 Received: from DB6PR0501CA0007.eurprd05.prod.outlook.com (2603:10a6:4:8f::17) by DBBPR08MB4853.eurprd08.prod.outlook.com (2603:10a6:10:d5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 30 Apr 2021 15:24:33 +0000 Received: from DB5EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:8f:cafe::25) by DB6PR0501CA0007.outlook.office365.com (2603:10a6:4:8f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Fri, 30 Apr 2021 15:24:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; gcc.gnu.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;gcc.gnu.org; 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 DB5EUR03FT014.mail.protection.outlook.com (10.152.20.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Fri, 30 Apr 2021 15:24:33 +0000 Received: ("Tessian outbound 52fcc5bd9d3a:v91"); Fri, 30 Apr 2021 15:24:33 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5da4ae0e52c8c16a X-CR-MTA-TID: 64aa7808 Received: from 3901db4d2762.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1051A946-DC21-414B-A53F-916FB8CDABCA.1; Fri, 30 Apr 2021 15:24:22 +0000 Received: from EUR03-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 3901db4d2762.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 30 Apr 2021 15:24:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RHmzGQ04F7/6iZiR7KbRHwnugMaJ587IS3LibR2Mwyrto9CSSge1dvRIVyN6+d9Her/P4acvjjK5z7PeoReR/i/q01YY4fkcFVF5Fda/B07VmOE9phzQeWDu9O/ag/NqWnv3cro5LRcnhiErPNj70AXMYD1h4jdXGsC1NE1h0sDxUEJgDTI6YDToZCqMNB08rSL09QCesH9536uAxiV8+EslVO0xlXI8KWNBAxxXy8F0LkX6rbSx6UBcI7g3+tfDaPJEvWbty0vJs7nBhn4xAyyxRwDoRi/2QhnX+RDl4pE8roDOnIdYVQBqsbTj3X9rLUL19r1a5D9HF7nBKQJXKw== 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-SenderADCheck; bh=giQBuV6Hj5KQd20MPokNLgBVA/ZXmfa+pyABnlrs7uQ=; b=bKmm+znYyV1qDl3+ShkC6CJbKdWvpMcha7R+QsJGFfRInSIEwxuz+ANz19TLAoQIVGNdyErwCLwQ9dPMnxSL/5cVhD6D0zSWKaR23v5JIKiopYfvtmVSkiZbAJRjVSh1DmPtNlYmYiQtAaprLr6dPBlzzD+JEMQd/+93nh4KOF7W55eqeq4atZnO9HAa/FIrqxz3TdUjg+lXsnopw84ToWCJUmel9pExYBfSPdBMPrR0z7iMP2QRClvdzvecE8zgVcwqCuyK6cDHwsM5aDewnEkDLlCKCyocOL/g8/3UOoXmUWKQzRBW8Ds1I22xnc1G8XmwuEL/0AFrZ0J0YutRqQ== 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 Authentication-Results-Original: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=arm.com; Received: from VI1PR0802MB2368.eurprd08.prod.outlook.com (2603:10a6:800:9d::10) by VI1PR0802MB2542.eurprd08.prod.outlook.com (2603:10a6:800:ad::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 30 Apr 2021 15:24:21 +0000 Received: from VI1PR0802MB2368.eurprd08.prod.outlook.com ([fe80::f1fd:229a:89be:eca]) by VI1PR0802MB2368.eurprd08.prod.outlook.com ([fe80::f1fd:229a:89be:eca%7]) with mapi id 15.20.4065.034; Fri, 30 Apr 2021 15:24:21 +0000 Date: Fri, 30 Apr 2021 16:18:24 +0100 To: gcc-patches@gcc.gnu.org Subject: [GCC-10 backport][PATCH] arm: _Generic feature failing with ICE for -O0 (pr97205). X-Originating-IP: [217.140.106.52] X-ClientProxiedBy: LO4P123CA0361.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18e::6) To VI1PR0802MB2368.eurprd08.prod.outlook.com (2603:10a6:800:9d::10) Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from e120703-lin.cambridge.arm.com (217.140.106.52) by LO4P123CA0361.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18e::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Fri, 30 Apr 2021 15:24:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0202c00b-8a9a-418e-6e88-08d90bec0ea0 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2542:|DBBPR08MB4853: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Cpd1pQM8A501g53iiOWkOu7OIcnEAVimI/xdcLUPZ3GxFxgP1vtb+jbojIHOhdTN5bExC6xuVLKVmWmkMygDOL8aQVF/kUyU0jd4CLjdi5gix1lqkZdpthEzzLW5CeghZ6nMVlrBmLXlHckeT6YVz2H1QdPfNnsk4L3pkTuLjVBjMz0gy+mnwXiQc2moJdMrdYKDCS4s+Mnm+687F3Rjps37mH5Zh3GR86TBQCTCN/JZuM5jWLiD/iR69wOcygUEsWaOQDb9ohWv2QXBGAv9OPAn5w/QXlVmSLG05paTkA2m5weYx/j+0Rv6NsYzrdQ4w3QboBS8j942luBsV1XE5joE6XkkCba35dcWaa9Zi427Y3SzRdgSP9csUxeTVvdJz0P07ErOCSOTqVLnng68K3yc8NroaGVEzkoYYkpP0wxl+/VaBPtrbLgxKuVqFdHy3pHIC7htJ1SvFz4wqGnoxixfZt/RF2Bk2XULDf9O/E/V6jiofpBAA9G9uhfXOHqU5uBvxfjzlhBUJKHAjJB/fAOtxqhd0UOx2+cZUXX20YiALEO8e18AXfnevjpActSih0T7OH9uXGTX5rU4amE0GgoKf5cizaQu0Kc1hzFObpX2HcovGERjjLFGI6Mhv5pSi6NW1EO6oyDLQf9RRJ2Taz3VH3Amn1kOXBHuVTrowFmOcTw0iKaFO3Q1Iu2XRO7e X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0802MB2368.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(6916009)(66476007)(66556008)(52536014)(66616009)(8676002)(86362001)(66946007)(38100700002)(38350700002)(2906002)(6486002)(8936002)(44832011)(4326008)(316002)(6512007)(33656002)(5660300002)(9686003)(26005)(45080400002)(235185007)(186003)(478600001)(33964004)(16526019)(52116002)(956004)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: oVZ98ZS++pXbchjEJ7lI5YBhMgHUCoywp9qtXI240RY/Gum1xAKkHyj/GTZf+EeKFqyJgP/0bZV2/uKlem94Pq+vW9zg8vrv/aXZa9KLNh1TOo0NGPBOht9kjXAp1SgPEWiMyam71DQXFY3Af4EbvnXgqWCVGytlR6kXOI5GWGvZo48hgqydokaD8xMBrhEmDwna571mUEkkJIX7Yy2eyYQtvVRvtKE6F+4PEcmpKZ0/+vNITi60MZqf932RRjUQttT3ARCsVKy6ai0Ia/vvGfNgyts5LKQNYwXSBSNRE8ULQffMd9+WKSFMlEHrDXFrN70/9PE9KnXB4MtubC4W5yKCi3lclzUfKA7oF+OPgw2yED/+4owcHqeuDUFSW0nZaSgIe/KCkbnzB99ifcrego20U9xuYpm/aIO559VN9OvD0iKeV2i9x1WUo8PfFaumHsB8S3KlaZz0NQ6Ui6dtvFsRetlDv7Iq0tz5MA1rFMqSCKq9sZKp8sR/g28PwAqwsT8M3pfaJDPeJT0CmBtI94Q9vVDMXGmj5CyyixHreTwky68wmPjuoxgQqbjY62kEufU8wDQfzsQ6xdvJg832Q9Mr7BIOEygGrpqQ+SnW2XNWhA1q0xQk62MNUFvpjbSr9q2wF8qtOGL8Fe6aNo1RAugXAxysgffGfxerlVwHXAXxzCXkMxDSc7+REF+b2zVcLJnCyrOgZGEsaXmZwH9DvFf5bgt9Q1BC/aB2J9M534ySd+s4E4ogVB4ZZHgutDhCOHDBjSjlY7IuX4dxo0V2ghsLA5t6X7qTj1i3GM+WpBnR8BB1Jh6PYxL1gMy4qzTLrKGbCAVqyZXc3kcZmSirsYnPYK/INY9RbeKofOElzw/jLgmxZprYJd0db2bM8bLVIWy7+2y0NFpQwCDSa5IyOq0Me1GuZwe4dpgl4uTRthY9i5XU0Qv6g4yclk53RK7JfJUI1An7zD8RGoUl7YV65WmypG3JwJtlK+pi66POPfPRZVa6A+mUKD58wMPsKUZINERg/ZUzhGLkszzUd7HwZMLJ1i/WrDnlz1ly+qyFIUQyYdFU652aD6IojZiOeNwDWKgsx6/BHUrE0JHix6AChhXVm8RMF4z/oVTvLMIHQfp5USlnr0QRdmIzGR5Onu2czPP8RpCECfDg5OOFf0CAOdRWM+wMSKELGz/8ViS0PnPc15MX77ehIVA30iTyJyd7GHczPPr2akMMQOMvn40MjIhsATHNhu8hHTnLkZsTfUy7S2SFnQWgdtWws07ofN0kTvXrDNctukqnyz2JZT7QzyhSbElqBX8C3mqwJ8UgX5pVebtoNx04lsQLYb3MQqb0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2542 Original-Authentication-Results: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: bc7d8f1c-9425-4965-b562-08d90bec06d5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bCn9yYrYBu4q7OghQdRSfkUW+yGK7eSe2O0E7MH5zJCxl+SSn2KWNHeaS6+Ljsm/1ByAsD+ChMlCuoP3/o+mbI8O7kPlDVk2PypxxkT0qJSFikeV+oiiYHZj3138Kat0B5jcxQZzk20SJ6zFyBFnU6ShyVvSD4v76IGcEzGmGvRB6ac03/xc1IIb4xEYAF5dX+nNvTZ+2Sp0MVoL5S2PHTA2DvfSQZhrJvhakpXJBbfBU84hUGywj2Ohljs1tI15QDHvb2xh8cXxd6KtPl3kKGFvnOqNNfyVPI/iU15UzVE0oNu9WbTa7ryzByrk1cehTzLe8yZqpaV/jXvoj7P63qVc1q5cUWAWkwZFW57sAZCUwtGtgoyXTrKsUYCW6qCGU4O1plgNIlRppkJKe43xxqgbgIwbtOloxSqfAKSEq9R8G38x0vXGAiulr9bsFZp8s+VHWeYdBHPFIaIlmG3suPKvuO8werNtkJPtXCUX7AL+64kU6+Hx5/+Z7TAgCT0KW63WzRzqFMpo9VhIGtwgivyVqISxRi+95K7nc0SHQFIB5FrO4pmT4FTdxZojMj5iAWhj0+i7w1aHuIYHJRkVB3UP9k9+rqg5eaZdP+O4wA/W4d9Zb8+RQ6FJRl399korvVsHMUvH3vLWwxoBj+ELQzWhLKBAKaErS+SdoQ9haBM/XgJdg+3/i3FLisRRPGZuuV6/26QI6RuJ+xa0foeyeg== 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)(346002)(396003)(376002)(39860400002)(136003)(36840700001)(46966006)(26005)(86362001)(8676002)(316002)(33964004)(16526019)(36860700001)(6512007)(9686003)(956004)(2906002)(8936002)(70206006)(70586007)(66616009)(33656002)(186003)(44832011)(5660300002)(52536014)(47076005)(6916009)(4326008)(6486002)(45080400002)(235185007)(34020700004)(336012)(82740400003)(81166007)(82310400003)(478600001)(356005)(41533002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2021 15:24:33.5148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0202c00b-8a9a-418e-6e88-08d90bec0ea0 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: DB5EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4853 X-Spam-Status: No, score=-14.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Srinath Parvathaneni via Gcc-patches From: Srinath Parvathaneni Reply-To: Srinath Parvathaneni Cc: Richard.Earnshaw@arm.com Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, This is a backport to GCC-10 to fix PR97205, patch applies cleanly on the branch. Regression tested and found no issues. Ok for GCC-10 backport? Regards, Srinath. This makes sure that stack allocated SSA_NAMEs are at least MODE_ALIGNED. Also increase the MEM_ALIGN for the corresponding rtl objects. gcc: 2020-11-03 Bernd Edlinger PR target/97205 * cfgexpand.c (align_local_variable): Make SSA_NAMEs at least MODE_ALIGNED. (expand_one_stack_var_at): Increase MEM_ALIGN for SSA_NAMEs. gcc/testsuite: 2020-11-03 Bernd Edlinger PR target/97205 * gcc.c-torture/compile/pr97205.c: New test. (cherry picked from commit 23ac7a009ecfeec3eab79136abed8aac9768b458) ############### Attachment also inlined for ease of reply ############### diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index bf4f194ed993134109cc21be9cb0ed8a5c170824..4fef5d6ebf420ce4d6f59606ecd064f45ae59065 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -366,7 +366,15 @@ align_local_variable (tree decl, bool really_expand) unsigned int align; if (TREE_CODE (decl) == SSA_NAME) - align = TYPE_ALIGN (TREE_TYPE (decl)); + { + tree type = TREE_TYPE (decl); + machine_mode mode = TYPE_MODE (type); + + align = TYPE_ALIGN (type); + if (mode != BLKmode + && align < GET_MODE_ALIGNMENT (mode)) + align = GET_MODE_ALIGNMENT (mode); + } else { align = LOCAL_DECL_ALIGNMENT (decl); @@ -999,20 +1007,21 @@ expand_one_stack_var_at (tree decl, rtx base, unsigned base_align, x = plus_constant (Pmode, base, offset); x = gen_rtx_MEM (TREE_CODE (decl) == SSA_NAME ? TYPE_MODE (TREE_TYPE (decl)) - : DECL_MODE (SSAVAR (decl)), x); + : DECL_MODE (decl), x); + + /* Set alignment we actually gave this decl if it isn't an SSA name. + If it is we generate stack slots only accidentally so it isn't as + important, we'll simply set the alignment directly on the MEM. */ + + if (base == virtual_stack_vars_rtx) + offset -= frame_phase; + align = known_alignment (offset); + align *= BITS_PER_UNIT; + if (align == 0 || align > base_align) + align = base_align; if (TREE_CODE (decl) != SSA_NAME) { - /* Set alignment we actually gave this decl if it isn't an SSA name. - If it is we generate stack slots only accidentally so it isn't as - important, we'll simply use the alignment that is already set. */ - if (base == virtual_stack_vars_rtx) - offset -= frame_phase; - align = known_alignment (offset); - align *= BITS_PER_UNIT; - if (align == 0 || align > base_align) - align = base_align; - /* One would think that we could assert that we're not decreasing alignment here, but (at least) the i386 port does exactly this via the MINIMUM_ALIGNMENT hook. */ @@ -1022,6 +1031,8 @@ expand_one_stack_var_at (tree decl, rtx base, unsigned base_align, } set_rtl (decl, x); + + set_mem_align (x, align); } class stack_vars_data @@ -1327,13 +1338,11 @@ expand_one_stack_var_1 (tree var) { tree type = TREE_TYPE (var); size = tree_to_poly_uint64 (TYPE_SIZE_UNIT (type)); - byte_align = TYPE_ALIGN_UNIT (type); } else - { - size = tree_to_poly_uint64 (DECL_SIZE_UNIT (var)); - byte_align = align_local_variable (var, true); - } + size = tree_to_poly_uint64 (DECL_SIZE_UNIT (var)); + + byte_align = align_local_variable (var, true); /* We handle highly aligned variables in expand_stack_vars. */ gcc_assert (byte_align * BITS_PER_UNIT <= MAX_SUPPORTED_STACK_ALIGNMENT); diff --git a/gcc/testsuite/gcc.c-torture/compile/pr97205.c b/gcc/testsuite/gcc.c-torture/compile/pr97205.c new file mode 100644 index 0000000000000000000000000000000000000000..6600011fcf84660edcba8d968c78ee6aaa0aa923 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr97205.c @@ -0,0 +1,7 @@ +int a; +typedef __attribute__((aligned(2))) int x; +int f () +{ + x b = a; + return b; +} diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index bf4f194ed993134109cc21be9cb0ed8a5c170824..4fef5d6ebf420ce4d6f59606ecd064f45ae59065 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -366,7 +366,15 @@ align_local_variable (tree decl, bool really_expand) unsigned int align; if (TREE_CODE (decl) == SSA_NAME) - align = TYPE_ALIGN (TREE_TYPE (decl)); + { + tree type = TREE_TYPE (decl); + machine_mode mode = TYPE_MODE (type); + + align = TYPE_ALIGN (type); + if (mode != BLKmode + && align < GET_MODE_ALIGNMENT (mode)) + align = GET_MODE_ALIGNMENT (mode); + } else { align = LOCAL_DECL_ALIGNMENT (decl); @@ -999,20 +1007,21 @@ expand_one_stack_var_at (tree decl, rtx base, unsigned base_align, x = plus_constant (Pmode, base, offset); x = gen_rtx_MEM (TREE_CODE (decl) == SSA_NAME ? TYPE_MODE (TREE_TYPE (decl)) - : DECL_MODE (SSAVAR (decl)), x); + : DECL_MODE (decl), x); + + /* Set alignment we actually gave this decl if it isn't an SSA name. + If it is we generate stack slots only accidentally so it isn't as + important, we'll simply set the alignment directly on the MEM. */ + + if (base == virtual_stack_vars_rtx) + offset -= frame_phase; + align = known_alignment (offset); + align *= BITS_PER_UNIT; + if (align == 0 || align > base_align) + align = base_align; if (TREE_CODE (decl) != SSA_NAME) { - /* Set alignment we actually gave this decl if it isn't an SSA name. - If it is we generate stack slots only accidentally so it isn't as - important, we'll simply use the alignment that is already set. */ - if (base == virtual_stack_vars_rtx) - offset -= frame_phase; - align = known_alignment (offset); - align *= BITS_PER_UNIT; - if (align == 0 || align > base_align) - align = base_align; - /* One would think that we could assert that we're not decreasing alignment here, but (at least) the i386 port does exactly this via the MINIMUM_ALIGNMENT hook. */ @@ -1022,6 +1031,8 @@ expand_one_stack_var_at (tree decl, rtx base, unsigned base_align, } set_rtl (decl, x); + + set_mem_align (x, align); } class stack_vars_data @@ -1327,13 +1338,11 @@ expand_one_stack_var_1 (tree var) { tree type = TREE_TYPE (var); size = tree_to_poly_uint64 (TYPE_SIZE_UNIT (type)); - byte_align = TYPE_ALIGN_UNIT (type); } else - { - size = tree_to_poly_uint64 (DECL_SIZE_UNIT (var)); - byte_align = align_local_variable (var, true); - } + size = tree_to_poly_uint64 (DECL_SIZE_UNIT (var)); + + byte_align = align_local_variable (var, true); /* We handle highly aligned variables in expand_stack_vars. */ gcc_assert (byte_align * BITS_PER_UNIT <= MAX_SUPPORTED_STACK_ALIGNMENT); diff --git a/gcc/testsuite/gcc.c-torture/compile/pr97205.c b/gcc/testsuite/gcc.c-torture/compile/pr97205.c new file mode 100644 index 0000000000000000000000000000000000000000..6600011fcf84660edcba8d968c78ee6aaa0aa923 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr97205.c @@ -0,0 +1,7 @@ +int a; +typedef __attribute__((aligned(2))) int x; +int f () +{ + x b = a; + return b; +}