From 3b0cd3f02ed6c151aacb50364222566bef29e72f Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 27 Jan 2022 17:18:28 +0100 Subject: [PATCH] [Ada] Do not override inlining heuristics for expression functions at -Os gcc/ada/ * gcc-interface/trans.cc (Subprogram_Body_to_gnu): Do not deal with inlining heuristics for expression functions here but... * gcc-interface/decl.cc (inline_status_for_subprog): ...here instead and do not override them at -Os. --- gcc/ada/gcc-interface/decl.cc | 9 ++++++++- gcc/ada/gcc-interface/trans.cc | 7 +------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index aae1ef1..e6f2df8 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 1992-2021, Free Software Foundation, Inc. * + * Copyright (C) 1992-2022, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -5037,6 +5037,13 @@ inline_status_for_subprog (Entity_Id subprog) && compare_tree_int (TYPE_SIZE (gnu_type), MAX_FIXED_MODE_SIZE) <= 0) return is_prescribed; + /* If this is an expression function and we're not optimizing for size, + override the heuristics, unless -gnatd.8 is specified. */ + if (Is_Expression_Function (subprog) + && !optimize_size + && !Debug_Flag_Dot_8) + return is_prescribed; + return is_requested; } diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index e9701cd..67c69b0 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 1992-2021, Free Software Foundation, Inc. * + * Copyright (C) 1992-2022, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -3906,11 +3906,6 @@ Subprogram_Body_to_gnu (Node_Id gnat_node) locus = input_location; DECL_SOURCE_LOCATION (gnu_subprog_decl) = locus; - /* If the body comes from an expression function, arrange it to be inlined - in almost all cases. */ - if (Was_Expression_Function (gnat_node) && !Debug_Flag_Dot_8) - DECL_DISREGARD_INLINE_LIMITS (gnu_subprog_decl) = 1; - /* Try to create a bona-fide thunk and hand it over to the middle-end. */ if (Is_Thunk (gnat_subprog_id) && maybe_make_gnu_thunk (gnat_subprog_id, gnu_subprog_decl)) -- 2.7.4