From patchwork Thu May 9 09:59:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1097444 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-500355-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="oqMPBs4n"; 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 45082d3sygz9sBp for ; Thu, 9 May 2019 19:59:37 +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 :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=KAFYNRaX+J4dxN3w iV3kJc3bMG1I/x9xqy/qprVCMKEb9AAXpnoeklmpcxfvpzHgXSQAgUokz/hPYMjl ngjg/+13m226qNAy8VhLZ+n1DaaCyC3knN6J/87aM/3QpNUtdMwNgjiyfbEW25Ur lwGk8l90OPeH5wEUeHkO2XM5oK0= 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 :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=KVKd3VYEH57g21U62XT27I kVtY0=; b=oqMPBs4nJfTbFggZERTVwtitqQ0ybl9csYzibx01t06zNWp/n4wpbU R4RXcThi1gKVFfrHDdqzI8mR1cEGwjU84tBRXNl2aYSNKlb678Quzs0OMn8JN+4E Lg8fTsnOgF21rGMYBfHZuyrg5/9AX8mLKtPQCrz1tVFkJ7kFUh2oI= Received: (qmail 113180 invoked by alias); 9 May 2019 09:59:30 -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 113171 invoked by uid 89); 9 May 2019 09:59:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:account, U*mliska, D*suse.cz, mliska@suse.cz X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 09 May 2019 09:59:28 +0000 Received: from svr-orw-mbx-06.mgc.mentorg.com ([147.34.90.206]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1hOfpj-0004is-IL from Thomas_Schwinge@mentor.com ; Thu, 09 May 2019 02:59:23 -0700 Received: from svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) by SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 9 May 2019 02:59:21 -0700 Received: from tftp-cs (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server id 15.0.1320.4 via Frontend Transport; Thu, 9 May 2019 02:59:21 -0700 Received: by tftp-cs (Postfix, from userid 49978) id 84F49C2322; Thu, 9 May 2019 02:59:20 -0700 (PDT) From: Thomas Schwinge To: CC: Jan Hubicka , Richard Biener , Martin =?utf-8?b?TGnFoWth?= Subject: [committed] Clean up MPX-related stuff: CIF_CHKP (was: [PATCH] Clean up another MPX-related stuff.) In-Reply-To: <74D812C4-9403-4263-BAE1-113A65C95741@gmail.com> References: <0dd0d656-59b3-f284-40a9-3d80eea713ca@suse.cz> <74D812C4-9403-4263-BAE1-113A65C95741@gmail.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Thu, 9 May 2019 11:59:15 +0200 Message-ID: <87woj0dk3w.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Wed, 13 Feb 2019 14:47:36 +0100, Richard Biener wrote: > On February 13, 2019 6:53:17 AM GMT+01:00, "Martin Liška" wrote: > >As Honza noticed, there's still some leftover from MPX removal. > >May I remove another bunch of fields now, or should I wait > >for next stage1? > > You can do it now. I recently stumbled across an additional leftover piece: > 2019-02-13 Martin Liska > * ipa-fnsummary.c (compute_fn_summary): Likewise. | --- a/gcc/ipa-fnsummary.c | +++ b/gcc/ipa-fnsummary.c | @@ -2449,13 +2449,7 @@ compute_fn_summary (struct cgraph_node *node, bool early) | info->account_size_time (2 * ipa_fn_summary::size_scale, 0, t, t); | ipa_update_overall_fn_summary (node); | info->self_size = info->size; | - /* We cannot inline instrumentation clones. */ | - if (node->thunk.add_pointer_bounds_args) | - { | - info->inlinable = false; | - node->callees->inline_failed = CIF_CHKP; | - } | - else if (stdarg_p (TREE_TYPE (node->decl))) | + if (stdarg_p (TREE_TYPE (node->decl))) | { This removed the (only) user of 'CIF_CHKP', but didn't remove its definition. (Probably because of that one going by the un-prefixed short-hand name of 'CHKP'?) As obvious, now cleaned up on trunk in r271029, and on gcc-9-branch in r271030, see attached. Grüße Thomas From 3380d3e1bc51edb2d3b6baf6e213d699045f6d3a Mon Sep 17 00:00:00 2001 From: tschwinge Date: Thu, 9 May 2019 09:52:53 +0000 Subject: [PATCH] Clean up MPX-related stuff: CIF_CHKP ..., which was forgotten in recent r268844. gcc/ * cif-code.def (CHKP): Remove. trunk r271029 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@271030 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/cif-code.def | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b7791f10e3c..3d66d8e4df4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2019-05-09 Thomas Schwinge + + * cif-code.def (CHKP): Remove. + 2019-05-07 Kelvin Nilsen Backport from mainline. diff --git a/gcc/cif-code.def b/gcc/cif-code.def index 0fabfebca1c..cee16cf7cb7 100644 --- a/gcc/cif-code.def +++ b/gcc/cif-code.def @@ -141,7 +141,3 @@ DEFCIFCODE(EXTERN_LIVE_ONLY_STATIC, CIF_FINAL_ERROR, /* We proved that the call is unreachable. */ DEFCIFCODE(UNREACHABLE, CIF_FINAL_ERROR, N_("unreachable")) - -/* We can't inline because of instrumentation thunk. */ -DEFCIFCODE(CHKP, CIF_FINAL_ERROR, - N_("caller is instrumentation thunk")) -- 2.17.1