From patchwork Tue Aug 8 11:11:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 799107 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-460016-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="oMC7UsAp"; 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 3xRWtP1mnSz9s7C for ; Tue, 8 Aug 2017 21:11:24 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; q=dns; s=default; b=nhJCzWs9Y8WeFgGuh059pt5Oi2owMCOeq5PiJD6cdrSpsCX2O6 LY/S3eTCcfHE8cgy0YEHi0WbQyZWEaP77YGlT5BxO/7Fh1JdusrhSMJu2zMOYIYt v8xGI3+7RL+fL/1g0NESQ0LjUFnV+ht5FWgYk7dS1hOi5TC6zxhxADGtw= 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:from :subject:to:cc:message-id:date:mime-version:content-type; s= default; bh=kxlySuE0iqBgQpToE73PvMEi1Hs=; b=oMC7UsApXzyTIbVLJxAp 46MjfgWnFiezCI+A33mbobvJqLF4nIGvEdfEVIskRHgnygpoLqROUhPnQGk9TN3t 8uUe/y9kL83sfPU/qnYsvtOM61t1Kw6pzgg8MkYT2jniwrs6mpeVk5OMa7qiGLZP gbjseg4v/s1cXTGvxqsijRk= Received: (qmail 101554 invoked by alias); 8 Aug 2017 11:11:15 -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 101539 invoked by uid 89); 8 Aug 2017 11:11:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 08 Aug 2017 11:11:13 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 37EC4AC6B; Tue, 8 Aug 2017 11:11:11 +0000 (UTC) From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Subject: [PATCH] ICF: properly handle LABEL_DECLs (PR tree-opt/81696). To: gcc-patches@gcc.gnu.org Cc: Jan Hubicka Message-ID: <7d571cd7-7e8c-f283-91b3-4062eed47cdf@suse.cz> Date: Tue, 8 Aug 2017 13:11:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 X-IsSubscribed: yes Hello. As LABEL_DECL can point to another function (non-local goto), we must properly compare them. Patch can bootstrap on ppc64le-redhat-linux and survives regression tests. Ready to be installed ? Martin gcc/ChangeLog: 2017-08-08 Martin Liska PR tree-opt/81696 * ipa-icf-gimple.c (func_checker::compare_cst_or_decl): Consider LABEL_DECLs that can be from a different function. gcc/testsuite/ChangeLog: 2017-08-08 Martin Liska PR tree-opt/81696 * gcc.dg/ipa/pr81696.c: New test. --- gcc/ipa-icf-gimple.c | 6 +++++- gcc/testsuite/gcc.dg/ipa/pr81696.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/ipa/pr81696.c diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c index 08dd980fdf3..f44a995f580 100644 --- a/gcc/ipa-icf-gimple.c +++ b/gcc/ipa-icf-gimple.c @@ -361,10 +361,14 @@ func_checker::compare_cst_or_decl (tree t1, tree t2) } case LABEL_DECL: { + if (t1 == t2) + return true; + int *bb1 = m_label_bb_map.get (t1); int *bb2 = m_label_bb_map.get (t2); - return return_with_debug (*bb1 == *bb2); + /* Labels can point to another function (non-local GOTOs). */ + return return_with_debug (bb1 != NULL && bb2 != NULL && *bb1 == *bb2); } case PARM_DECL: case RESULT_DECL: diff --git a/gcc/testsuite/gcc.dg/ipa/pr81696.c b/gcc/testsuite/gcc.dg/ipa/pr81696.c new file mode 100644 index 00000000000..2d3d63ff0bb --- /dev/null +++ b/gcc/testsuite/gcc.dg/ipa/pr81696.c @@ -0,0 +1,26 @@ +/* { dg-options "-O2 -fdump-ipa-icf-details" } */ + +int +main (int argc, char **argv) +{ + __label__ lab4, lab5, lab6; + + void foo (void) { goto lab4; } + void foo2 (void) { goto lab4; } + void bar (void) { goto lab5; } + void baz (void) { goto lab6; } + + if (argc) + foo (); + else + foo2 (); + + lab4:; + bar (); + lab5:; + baz (); + lab6:; + return 0; +} + +/* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf" } } */