From patchwork Mon Jan 22 15:10:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudakshina Das X-Patchwork-Id: 864273 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-471800-incoming=patchwork.ozlabs.org@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.b="jS8EB69A"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQFHv5Dk7z9s9Y for ; Tue, 23 Jan 2018 02:11:06 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=mm638feUxzan0dMLbAJdPL1w8kNnUeUwrjwuVndz7GgTRiYy1p d+LWe+IUkBCt8t0+nPTZWuwcAy92tVVbOWvzPtmF40IOWEX9/Z3XM/uXtRd+b1iV DveAxlwXkGYQzUKIsD776EWz4E6BYkdzGQ7Ct9EmiHB5J9ywzmZ6LlkB0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=N3AoHpNA4whAcVo2SynwgOnY0lI=; b=jS8EB69AYgPda01MDWgH iA4hL5vU0QahGEsjPndRROJL5A8HwlCmD8n0IsVr9KpESbMHoP4UT6j1gptTo9DL 0tJ9QXQge+yoTwT8yB5WzksfptxSCDMHgjPRkXXTgHRFAtNSwONhRYR7ywImnE4a gLU4RuJoIVsrKPiwf4DwvpQ= Received: (qmail 76859 invoked by alias); 22 Jan 2018 15:10:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 76830 invoked by uid 89); 22 Jan 2018 15:10:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=msg01058.html, UD:msg01058.html, msg01058html, expmed.c X-HELO: EUR02-AM5-obe.outbound.protection.outlook.com Received: from mail-eopbgr00051.outbound.protection.outlook.com (HELO EUR02-AM5-obe.outbound.protection.outlook.com) (40.107.0.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 22 Jan 2018 15:10:56 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Sudi.Das@arm.com; Received: from [10.2.206.246] (217.140.96.140) by VI1PR08MB1055.eurprd08.prod.outlook.com (2a01:111:e400:c549::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Mon, 22 Jan 2018 15:10:52 +0000 To: "gcc-patches@gcc.gnu.org" Cc: nd , Kyrill Tkachov , Ramana Radhakrishnan , Richard Earnshaw From: Sudakshina Das Subject: [PATCH PR82096][gcc-7] Backport: Fix ICE in int_mode_for_mode, at stor-layout.c:403 with arm-linux-gnueabi Message-ID: <8329ffa4-2b7a-43d3-ed0a-10565eae2904@arm.com> Date: Mon, 22 Jan 2018 15:10:50 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 X-ClientProxiedBy: AM5P194CA0010.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::20) To VI1PR08MB1055.eurprd08.prod.outlook.com (2a01:111:e400:c549::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60c8b8fe-94e4-43f4-0945-08d561aa5432 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(49563074)(7193020); SRVR:VI1PR08MB1055; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB1055; 3:AfmyePGKnr/+YvsFRABquS+hYa978CoflAph08nNXnqqhZRJmsOIMFr8JQE7ZdTfjS3Vb7PI1ncNAVJq83FkSnEXy35RB6m369Md0GjITcoG/Pje+kRUFgOzOM8M6vMSWGCxbo300tu3m0n83XaIgu8eIGw8aONgiRZ+39xZw1bKSO0Rd3UCRbvDQCVnkfFEjVA8OkYcMEyJ7bkVS+QGA/vzOXoLcSjdK8M7fQt6nJ1C23/ipVZYsokhQqlr1tSV; 25:GMuXjibS70Jc9qIs3UhP1zuJ2CEGVa84kyXsHepIoSwqqK4J90an4W5ukZ8c/mpII/Su8linmbpi9obfPrBgB9OQHpxTHpz3/QOP26199AgiJ5lpM77NjvL/F38rMDvN6/wlt9bYWMKnWetTRbXay+I8pWpIjA0QQ+RXd+joAVNrYfGfDgczqGi/CtP9RblepfAlKocgyde03B/rlXqte048SCYPyQuQDJlUOySAZ/USNPKR74A2e+t6Yqce4ND8q7ZNkQSqayY/r7coU3ifEItul08MmKkAXuCGOOxcw2vM8Ma1/j56x1CkNTnQXpayeSEoV+y8fATQ5UqMcpw6hA==; 31:J+Gl7UBox12pM/3Jt2UYdZKhk3XuoJjtyXrCZCUgJ3uLSWsithHIrbmZpirkqQAnsybGxd1joC8R3wdaZjfUPs12Bd/SAUD+Kc7JdNziTOsU/HVPpa/pCJdWgyggpyik9WW1GK0A/nTNWtXvpqGwXqdd2eGBJGG/f94U1sIsq3dXbxiomk1ifRdnlZ/vFo4+Hg5KGZtY7HFyc/vM4jpxMKWxh42n2kS/VZrw55XlvPA= X-MS-TrafficTypeDiagnostic: VI1PR08MB1055: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB1055; 20:oA2lI3kaPZiriVyCpjBommM433ncngqyEICjoDn3ZYbXLswzNTM+0STPmj9waDNjOjDk8cpIs+ltiPa3uwIczCBUboSWzrDEh5vrpjFdgETd7FFm0WnM4c6EKy7fFbQttZ+pgHPlRQp7epXOc9VxkOSLvlz5iBTYh3f9KdiUFWI=; 4:Y9C8XaW424T355aSWDORvALC/l4wUpdhZYVYmQ+BdkRRjjNgDTqM4BCqAk1343AUhtpdibyTruUbIQ/ZCIAKsrWidAF5Qjs77Bl/IXN18h5sMygjgt6VH2KZ1aO36+ucstnaArRcbXn3dUp2/z45dqt9WSAzLcx9M3Fp9wGPR4acXSAUUMk1V5lTbu/ONT9lAGsTg1GTSMNCppPyozkxn2oiVyym96aRzoXG8JfCR05WzLJ779Ati+PIPTCluHLeChSNu4Ee6jHv2inF9JpcDROFhW7iz/kPQ6nHtu6zSSr8l9xo7e5vSUGk8wcfa44Qfa4oaUUuLzXFulZ3wZXMGVfAA/hAGiBC5U+G49FY49rYfirfpnpqYlzj8vCsr6T9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(22074186197030)(183786458502308); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(102415395)(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231023)(2400081)(944501161)(6055026)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:VI1PR08MB1055; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR08MB1055; X-Forefront-PRVS: 0560A2214D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(39380400002)(39860400002)(396003)(346002)(366004)(376002)(54534003)(199004)(189003)(377424004)(270700001)(2906002)(5890100001)(3846002)(97736004)(6116002)(31686004)(6306002)(568964002)(53936002)(36756003)(83506002)(6916009)(68736007)(7736002)(4610100001)(305945005)(2501003)(86362001)(16526018)(21490400003)(5000100001)(2476003)(81156014)(72206003)(54906003)(478600001)(8936002)(16576012)(966005)(37036004)(31696002)(84326002)(65956001)(316002)(65806001)(386003)(2351001)(66066001)(33964004)(52116002)(230783001)(106356001)(64126003)(6486002)(4326008)(25786009)(5640700003)(77096007)(58126008)(8676002)(81166006)(16586007)(65826007)(105586002)(26005)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB1055; H:[10.2.206.246]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB1055; 23:CGzUlJQI49Dlb49U6ZV3efEVAW7WsaKKVuSbwrW+S7o8OVwMHojaShUZDHbbQuOxrt9lWpJEiNCVR8dHWy9segf+LFld4ZH0f7opFPstwlVk/FGxiV6OEjuhEVvRATEGf5ILzHCZtMW68O8T6qvjX5V2Iij1tJRazP0CJdTxZiwk3jAvohC5SYsWnJ0mRJnzu8EPJeyiVB8WXj//KceKUo8DPLwV1yfSdtq8WvDy102aQxL6UbtssI/qe477wb24SNtLdjhaKLaDB4iwEeZBWwAJa41iWR7rbVb6UbrSTHLnCoRURdJvPVbEHv9KDwi4lR/HIbYMKnhFfjbzoKWyh/PZB9NlNtJyYOGGh18hj12GCUNXcDXfXjH3jvdujtIA6iNdDCzvkJAxMncGRmsywKU6cCtZ7xPnj3jXbS1h3mhyFf/LsGt5ka+NyxzRKnFjFAeQY7ScQE7IGIktb54jhPeHhOGk128+sRmH6lE3nhPvngz6MEEITAVbWEp/YMw6BJGVFI523bUJeh5zfSsq2EYO3Yiyh03fEpAsqrCwjQ6tRaYQsc6ZjlqEhxnJDuwMhNiPcQWCS9Dd/vpYZv0hgrJRnRQvTKuYZu/QR/celBe0SnMcp5VdNNDmhb+YaA3t5wSmZ/pu96/ta2BUAvoY4D+2xpYpRxchyrQ5le1BNzE1XWlZvUxqqsF7mWEqnRIauFjy1atNlK42lalfzdeSUGO2Nnwmk11vTMdwjz7ANP2GKpsF0P4s3FtmnFrGC+hAQ4EQUiSWl/vmmpObLo3xOWPokuGFY+DpPpG/1pLZfcKv+r3QHunJe2ziUClB4aSP3buC/dL87Ix3amKTEpjcHb6WIkQ8tt79QabqlDsESXR5AH938y7E3M7aktfA8JvTQiv0j6aNbYWIW6Xez7fNGcxcwLVxe7Nw77g+dRAQW1rx1ZB3aaHZgrCMtKorxd3dVwzjBYLyk8ef1eLRCprXH5n9oLy1OPF+b0jPiEnLepKLkBMJjTr0P+9pe0pLNwM4DpaQAW2z3hkqRWYWqYGpAZ0QwPjFno12ym3w1sV2Fqhz5JoZa8e7l5zOC37DPpXhKzsFukUqrk29qWIz/iVBYkL+s+OkETy6/jDTpWAu//cqZQ5sH4F1+6o+vjVlAvdaTfF1LXF3nX210bP30zT4tifEmYMicTk3mdTYYgEvjZWBZ4oEqt8/BFfnLg3YLGre6jLHZWDCgd9molSxuiEYQfbDxtHISKTaMvM7F7/E/4xd8KTVaSUCJY6ZbIdPrc/gqUKAsCMiPqGl9lfG9cQunZxdYqH0pLJ+zlB6M4deBorC2U3j0FTR6hCb706Bwf2j/TSpP3HPe1dKCQ22Wgymr1k5TaPIyp+3o1G5yqok2uaXGVW1k8BV0uC5aq/KKrkAyMeRZ5vxXeWy+0EudrN1ggIDek4GZSIODdfJIxrJlnah41fjZSBYX9W45Y6TpJVjm1VwKBY3du1H4muaGK/ao60uG8Dhciue/0BytJI+2rovaYm+XWzpXnxFCg3g0tEtZVbrwJ2hbSW9aZl45CSigA== X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB1055; 6:BcYt6QnlKJBrZgTNm1I6gCD3PQZFNijAYTf/sFcXM4a9p/8F06PKE8Yl+Q+LC8F+NFPKZnFto1z8YImkm+vJfOUDPhPj0iJfeybydQcG7P6qhZaV428NxcL5nNDh/jCNKsCtXz7DxKLoO0cOC3HOddpdt9JRJzjBX5X+SDd182FkvTh5e7C+VrYJ4smW0BgCaeaM8qBIhknAeQK5VttyzkXZhIc8irLJYE4Ph2H+VlYvo+bTGMLSOGgpTArU+HfVLxPlsnjbfihxwxhxlPaLszUfImmW7Tn2tWM/RCYiFxq2o17r/kVMxOjBGGrImvomxv7ZwDEIOYC2ZiBzZ1Dev169CtMbvvdSpo+NZtx8zok=; 5:RQwj4+aiFcBKiUG3qjCZVmJSg0wPai9PsLKmOfCGqM+fZjyYLpGl4Rxu57JgJMAS/6veuzHmR2z9wn/Mc/wRd4cBtNYf/SOY9eiG9nzaKIJjtO5UZh9uv2VjBpv5n9vpQ1Idh+dxsJ2YdNTD9BZnFTmXFxg5G8+8knFAMg/cEBI=; 24:6/DDOUaTvZvsSwU3x8N9aJhtjo4y9CydR2zMbFFye/t18BVuoaHp5gtk8xruMIb6OWyTDwpyWQA8jjc8Um67739cC89ORnlLB/fvQ+Hq9qw=; 7:ArmW/vwFxbEQhVi0e/J8BG7HkaLdKYsYsdoh6YjGuGijABv125Q5BdookexKszf6TM4OwilEg54Mxxq2Y6CSapfbW7L9lnhKH+sllDjrfQQ/DVoV51oYKs707ip3g45/MaEnpt9fSpQc4szkPrUnHqE0S/AzIG4Q9wtNY24LNv/QlOjXTspOCWMnyIyzPef0zv5iJ1ZlElPc6gzhL7bnTYAMcQPfHujL53bDOGSEB7eMCmAw9jM0S2VZJlUmZrAV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2018 15:10:52.4724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60c8b8fe-94e4-43f4-0945-08d561aa5432 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB1055 X-IsSubscribed: yes Hi This is a patch to backport r256526 and r256941 (Fix case fix) of trunk to fix emit_store_flag_force () function to fix the ICE. The original discussion is at https://gcc.gnu.org/ml/gcc-patches/2018-01/msg00219.html and https://gcc.gnu.org/ml/gcc-patches/2018-01/msg01058.html Is this ok for gcc-7-branch? Testing : Ran regression testing with bootstrapped arm-none-linux-gnueabihf. Thanks Sudi ChangeLog entries: *** gcc/ChangeLog *** 2018-01-22 Sudakshina Das Backport from mainline: 2018-01-10 Sudakshina Das PR target/82096 * expmed.c (emit_store_flag_force): Swap if const op0 and change VOIDmode to mode of op0. *** gcc/testsuite/ChangeLog *** 2018-01-22 Sudakshina Das Backport from mainline: 2018-01-10 Sudakshina Das PR target/82096 * gcc.c-torture/compile/pr82096.c: New test. diff --git a/gcc/expmed.c b/gcc/expmed.c index e9f634a..30001ac 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -5886,6 +5886,18 @@ emit_store_flag_force (rtx target, enum rtx_code code, rtx op0, rtx op1, if (tem != 0) return tem; + /* If one operand is constant, make it the second one. Only do this + if the other operand is not constant as well. */ + + if (swap_commutative_operands_p (op0, op1)) + { + std::swap (op0, op1); + code = swap_condition (code); + } + + if (mode == VOIDmode) + mode = GET_MODE (op0); + if (!target) target = gen_reg_rtx (word_mode); diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82096.c b/gcc/testsuite/gcc.c-torture/compile/pr82096.c new file mode 100644 index 0000000..d144b70 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr82096.c @@ -0,0 +1,11 @@ +/* { dg-require-effective-target arm_arch_v5t_ok { target arm*-*-* } } */ +/* { dg-skip-if "Do not combine float-abi values" { arm*-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ +/* { dg-additional-options "-march=armv5t -mthumb -mfloat-abi=soft" { target arm*-*-* } } */ + +static long long AL[24]; + +int +check_ok (void) +{ + return (__sync_bool_compare_and_swap (AL+1, 0x200000003ll, 0x1234567890ll)); +}