diff mbox series

[committed] Clean up MPX-related stuff: CIF_CHKP (was: [PATCH] Clean up another MPX-related stuff.)

Message ID 87woj0dk3w.fsf@euler.schwinge.homeip.net
State New
Headers show
Series [committed] Clean up MPX-related stuff: CIF_CHKP (was: [PATCH] Clean up another MPX-related stuff.) | expand

Commit Message

Thomas Schwinge May 9, 2019, 9:59 a.m. UTC 
Hi!

On Wed, 13 Feb 2019 14:47:36 +0100, Richard Biener <richard.guenther@gmail.com> wrote:
> On February 13, 2019 6:53:17 AM GMT+01:00, "Martin Liška" <mliska@suse.cz> 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  <mliska@suse.cz>

> 	* 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

Comments

Martin Liška May 9, 2019, 10:04 a.m. UTC | #1 
On 5/9/19 11:59 AM, Thomas Schwinge wrote:
> Hi!
> 
> On Wed, 13 Feb 2019 14:47:36 +0100, Richard Biener <richard.guenther@gmail.com> wrote:
>> On February 13, 2019 6:53:17 AM GMT+01:00, "Martin Liška" <mliska@suse.cz> 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  <mliska@suse.cz>
> 
>> 	* 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
> 
> 

Hi.

Thanks for the patch, it's obvious to me.

Martin
Richard Biener May 10, 2019, 7:12 a.m. UTC | #2 
On Thu, May 9, 2019 at 11:59 AM Thomas Schwinge <thomas@codesourcery.com> wrote:
>
> Hi!
>
> On Wed, 13 Feb 2019 14:47:36 +0100, Richard Biener <richard.guenther@gmail.com> wrote:
> > On February 13, 2019 6:53:17 AM GMT+01:00, "Martin Liška" <mliska@suse.cz> 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:

OK.

Richard.

> > 2019-02-13  Martin Liska  <mliska@suse.cz>
>
> >       * 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
>
>
diff mbox series

Patch

From 3380d3e1bc51edb2d3b6baf6e213d699045f6d3a Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
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  <thomas@codesourcery.com>
+
+	* cif-code.def (CHKP): Remove.
+
 2019-05-07  Kelvin Nilsen  <kelvin@gcc.gnu.org>
 
 	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