From ad085ef5fb4142df2027f81ea03992fdafc6e2f6 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 3 Jun 2021 12:39:39 +0200 Subject: [PATCH] Tame fix for PR ipa/99122 The return part has a major performance impact in Ada where variable-sized types are first-class citizens, but it turns out that it is not exercized in the testsuite yet, so back it out for now. gcc/ PR ipa/99122 * tree-inline.c (inline_forbidden_p): Remove test on return type. gcc/testsuite/ * gnat.dg/inline22.adb: New test. --- gcc/testsuite/gnat.dg/inline22.adb | 19 +++++++++++++++++++ gcc/tree-inline.c | 15 ++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/inline22.adb diff --git a/gcc/testsuite/gnat.dg/inline22.adb b/gcc/testsuite/gnat.dg/inline22.adb new file mode 100644 index 000000000000..5812c2f04dfd --- /dev/null +++ b/gcc/testsuite/gnat.dg/inline22.adb @@ -0,0 +1,19 @@ +-- { dg-compile } + +procedure Inline22 (L, U : Integer) is + + type Arr is array (Integer range L .. U) of Boolean; + + function Get_Zero return Arr; + pragma Inline_Always (Get_Zero); + + function Get_Zero return Arr is + begin + return (others => False); + end; + + A : Arr; + +begin + A := Get_Zero; +end; diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 5396131e176b..05d1a253d5ba 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -4025,17 +4025,10 @@ inline_forbidden_p (tree fndecl) wi.info = (void *) fndecl; wi.pset = &visited_nodes; - /* We cannot inline a function with a VLA typed argument or result since - we have no implementation materializing a variable of such type in - the caller. */ - if (COMPLETE_TYPE_P (TREE_TYPE (TREE_TYPE (fndecl))) - && !poly_int_tree_p (TYPE_SIZE (TREE_TYPE (TREE_TYPE (fndecl))))) - { - inline_forbidden_reason - = G_("function %q+F can never be inlined because " - "it has a VLA return argument"); - return true; - } + /* We cannot inline a function with a variable-sized parameter because we + cannot materialize a temporary of such a type in the caller if need be. + Note that the return case is not symmetrical because we can guarantee + that a temporary is not needed by means of CALL_EXPR_RETURN_SLOT_OPT. */ for (tree parm = DECL_ARGUMENTS (fndecl); parm; parm = DECL_CHAIN (parm)) if (!poly_int_tree_p (DECL_SIZE (parm))) { -- 2.47.2