From patchwork Mon Dec 19 10:09:52 2016 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: 88449 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1077058qgi; Mon, 19 Dec 2016 02:10:23 -0800 (PST) X-Received: by 10.99.217.21 with SMTP id r21mr27589692pgg.78.1482142223869; Mon, 19 Dec 2016 02:10:23 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id m129si17865873pga.12.2016.12.19.02.10.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 02:10:23 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-444714-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-444714-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-444714-patch=linaro.org@gcc.gnu.org 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=gKcLQjMbjQnig/oYzBoyy5xIn0EsD8XJLRqfzpWgoRzihdP5OI 8dJBVBUHwA+/Vt8otCX/QdNdX/4+c1gF4hvF05HYDrhKjrO8FalV7azXUqDVQZlj uS+JnRVA/N9UbHRtctR+LrGJJUE+MuPtt4vHJT+hP6mdmBa/FYhGETIVU= 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=dPAuLard62sAzUsv3ttL9L8YNK0=; b=ERWl7EH/f33kmGXEtl5g U3iZbz/M6fqNmiJ0bi+nrxKwcv0vK/Rq9v1mIgJ99vohFI0hyjLc8k/B5y69hcRx TPwnVaH0rgZgMTztyqnpg8Z1R9mzFaiUqiV/kNsryNiYoZEtYnPqJgZkb0wETgB6 wqfzF6RNlbS7O1ZsIHQvqYg= Received: (qmail 41025 invoked by alias); 19 Dec 2016 10:10:07 -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 40971 invoked by uid 89); 19 Dec 2016 10:10:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS autolearn=ham version=3.3.2 spammy=D*cz, U*mliska, D*suse.cz, mliskasusecz X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 19 Dec 2016 10:09:55 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3E1EFAD42; Mon, 19 Dec 2016 10:09:53 +0000 (UTC) To: GCC Patches Cc: Jan Hubicka , Martin Jambor From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Subject: [PATCH] Fix IPA CP where it forgot to add a reference in cgraph Message-ID: <6421e992-7681-1456-2a73-ba79fd8b00c1@suse.cz> Date: Mon, 19 Dec 2016 11:09:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 X-IsSubscribed: yes Hello. Building mariadb with -flto exposes a bug which I also used to see in Firefox. It's caused by IPA CP starting from r236418, where the pass started to propagate const VAR_DECLs. Problem is that the pass does not update call graph by adding IPA_REF_READ of the propagated variable. Patch can bootstrap on ppc64le-redhat-linux and survives regression tests. Ready to be installed? Martin >From 477e81fde08d0520ce552ec8baa0349590dc683c Mon Sep 17 00:00:00 2001 From: marxin Date: Mon, 19 Dec 2016 11:03:34 +0100 Subject: [PATCH] Fix IPA CP where it forgot to add a reference in cgraph gcc/ChangeLog: 2016-12-19 Martin Liska * cgraphclones.c (cgraph_node::create_virtual_clone): Create either IPA_REF_LOAD of IPA_REF_READ depending on whether new_tree is a VAR_DECL or an ADDR_EXPR. * ipa-cp.c (create_specialized_node): Add reference just for ADDR_EXPRs. * symtab.c (symtab_node::maybe_create_reference): Remove guard as it's guarded in callers. --- gcc/cgraphclones.c | 6 +++++- gcc/ipa-cp.c | 3 ++- gcc/symtab.c | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c index 349892dab67..93c86e6a1cc 100644 --- a/gcc/cgraphclones.c +++ b/gcc/cgraphclones.c @@ -624,7 +624,11 @@ cgraph_node::create_virtual_clone (vec redirect_callers, || in_lto_p) new_node->unique_name = true; FOR_EACH_VEC_SAFE_ELT (tree_map, i, map) - new_node->maybe_create_reference (map->new_tree, IPA_REF_ADDR, NULL); + { + ipa_ref_use use_type + = TREE_CODE (map->new_tree) == VAR_DECL ? IPA_REF_ADDR : IPA_REF_LOAD; + new_node->maybe_create_reference (map->new_tree, use_type, NULL); + } if (ipa_transforms_to_apply.exists ()) new_node->ipa_transforms_to_apply diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index d3b50524457..fd312b56fde 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -3787,7 +3787,8 @@ create_specialized_node (struct cgraph_node *node, args_to_skip, "constprop"); ipa_set_node_agg_value_chain (new_node, aggvals); for (av = aggvals; av; av = av->next) - new_node->maybe_create_reference (av->value, IPA_REF_ADDR, NULL); + if (TREE_CODE (av->value) == ADDR_EXPR) + new_node->maybe_create_reference (av->value, IPA_REF_ADDR, NULL); if (dump_file && (dump_flags & TDF_DETAILS)) { diff --git a/gcc/symtab.c b/gcc/symtab.c index 73168a8db09..562a4a2f6a6 100644 --- a/gcc/symtab.c +++ b/gcc/symtab.c @@ -598,8 +598,6 @@ symtab_node::maybe_create_reference (tree val, enum ipa_ref_use use_type, gimple *stmt) { STRIP_NOPS (val); - if (TREE_CODE (val) != ADDR_EXPR) - return NULL; val = get_base_var (val); if (val && VAR_OR_FUNCTION_DECL_P (val)) { -- 2.11.0