From patchwork Tue Jan 17 16:14:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Makarov X-Patchwork-Id: 716276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3v2wD10y1Qz9tJD for ; Wed, 18 Jan 2017 03:14:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="D9TFy5j9"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=sLHys9iGtHvxlNjxJZcbLT913rmNI1FnpZXeO8/JNWdj9yE2q+ Y3Xcew9zwutKHdjE5fPvm8JUqo6BJOZthRHG7tIkFtDXm0W0Py5bSOIE1USCNm3R gN3od2uajGtpCZJDLlvtnW3Ixnhh2Cqt2PlNo8Jq1nmfLXdoJ8TbTvSX0= 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 :from:subject:message-id:date:mime-version:content-type; s= default; bh=xlHrW9qxiMrCHEzGAnIDXUh5VNg=; b=D9TFy5j9VqJNpvnlVmVl utP7qp2bZ2a3ZRQhIDlcQ7wIa6MICx4vZnmjDmrHCsn+NCOr83YERgZREbaWRVWp ZAWfjeP+HMc2G4/DulysSRtXGynkCxOmu79+ESF8iKTHdQIF1QnTxR5wvWvoqW+G /aa8rlzR0h66xHPl0gVKndo= Received: (qmail 57885 invoked by alias); 17 Jan 2017 16:14:32 -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 57875 invoked by uid 89); 17 Jan 2017 16:14:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.3 required=5.0 tests=BAYES_00, KAM_ASCII_DIVIDERS, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=7878, mbigendian, mbig-endian, sk:reg_cla X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 Jan 2017 16:14:21 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF79B81F07 for ; Tue, 17 Jan 2017 16:14:21 +0000 (UTC) Received: from topor.usersys.redhat.com (unused-10-15-17-214.yyz.redhat.com [10.15.17.214]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0HGELgf019861 for ; Tue, 17 Jan 2017 11:14:21 -0500 To: gcc-patches From: Vladimir Makarov Subject: patch to fix PR79058 Message-ID: <131cf136-c826-3639-1636-3ce186346de1@redhat.com> Date: Tue, 17 Jan 2017 11:14:21 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 X-IsSubscribed: yes The following patch fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79058 The patch was successfully bootstrapped and tested on x86-64. Committed as rev. 244535. Index: ChangeLog =================================================================== --- ChangeLog (revision 244534) +++ ChangeLog (working copy) @@ -1,3 +1,9 @@ +2017-01-17 Vladimir Makarov + + PR target/79058 + * ira-conflicts.c (ira_build_conflicts): Update total conflict + hard regs for inner regno. + 2017-01-17 Martin Liska PR ipa/71207 Index: ira-conflicts.c =================================================================== --- ira-conflicts.c (revision 244500) +++ ira-conflicts.c (working copy) @@ -787,8 +787,12 @@ ira_build_conflicts (void) if (outer_regno < 0 || !in_hard_reg_set_p (reg_class_contents[aclass], outer_mode, outer_regno)) - SET_HARD_REG_BIT (OBJECT_CONFLICT_HARD_REGS (obj), - inner_regno); + { + SET_HARD_REG_BIT (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), + inner_regno); + SET_HARD_REG_BIT (OBJECT_CONFLICT_HARD_REGS (obj), + inner_regno); + } } } Index: testsuite/ChangeLog =================================================================== --- testsuite/ChangeLog (revision 244534) +++ testsuite/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2017-01-17 Vladimir Makarov + + PR target/79058 + * gcc.target/arm/pr79058.c: New. + 2017-01-17 Jakub Jelinek PR tree-optimization/71854 Index: testsuite/gcc.target/arm/pr79058.c =================================================================== --- testsuite/gcc.target/arm/pr79058.c (revision 0) +++ testsuite/gcc.target/arm/pr79058.c (working copy) @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" } { "-mcpu=arm7tdmi" } } */ +/* { dg-options "-Os -mbig-endian -mcpu=arm7tdmi" } */ + +enum { NILFS_SEGMENT_USAGE_ACTIVE, NILFS_SEGMENT_USAGE_DIRTY } a; + +void fn2 (long long); + +void fn1() { + int b = a & 1 << NILFS_SEGMENT_USAGE_DIRTY; + fn2 (b ? (long long) -1 : 0); +}