From ea3a4ad0a334535466172e2860f7f5ed7795e331 Mon Sep 17 00:00:00 2001 From: Javier Miranda Date: Fri, 9 Mar 2012 14:48:24 +0000 Subject: [PATCH] sem_ch6.adb (Check_Body_To_Inline): In AAMP and VM targets use frontend inlining at all optimization levels. 2012-03-09 Javier Miranda * sem_ch6.adb (Check_Body_To_Inline): In AAMP and VM targets use frontend inlining at all optimization levels. * sem_util.adb (Must_Inline): In AAMP and VM targets, given that there is no inlining support in the backend, use also frontend inlining when compiling with optimizations enabled. * exp_ch6.adb (Expand_Call): Minor code reorganization. From-SVN: r185140 --- gcc/ada/ChangeLog | 10 +++++++++- gcc/ada/exp_ch6.adb | 8 ++++---- gcc/ada/sem_ch6.adb | 8 ++++++-- gcc/ada/sem_util.adb | 8 +++++++- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 826383eb5bb..194f6b00ac9 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2012-03-09 Javier Miranda + + * sem_ch6.adb (Check_Body_To_Inline): In AAMP and VM targets + use frontend inlining at all optimization levels. + * sem_util.adb (Must_Inline): In AAMP and VM targets, given that + there is no inlining support in the backend, use also frontend + inlining when compiling with optimizations enabled. + * exp_ch6.adb (Expand_Call): Minor code reorganization. + 2012-03-09 Eric Botcazou * gcc-interface/ada-tree.h (TYPE_VAX_FLOATING_POINT_P): Move around. @@ -504,7 +513,6 @@ can happen in an instantiation in programs that run afoul or AI05-0087. - 2012-02-17 Ed Schonberg * exp_ch6.adb (Legal_Copy): If layout is not diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index 5afb31c9ca1..7b6b296456c 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -3790,10 +3790,7 @@ package body Exp_Ch6 is Spec : constant Node_Id := Unit_Declaration_Node (Subp); begin - if Optimization_Level > 0 then - Do_Inline (Subp, Orig_Subp); - - elsif Must_Inline (Subp) then + if Must_Inline (Subp) then if In_Extended_Main_Code_Unit (Call_Node) and then In_Same_Extended_Unit (Sloc (Spec), Loc) and then not Has_Completion (Subp) @@ -3805,6 +3802,9 @@ package body Exp_Ch6 is else Do_Inline_Always (Subp, Orig_Subp); end if; + + elsif Optimization_Level > 0 then + Do_Inline (Subp, Orig_Subp); end if; -- The call may have been inlined or may have been passed to diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 57e0ccf886a..82898b901de 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -4888,9 +4888,13 @@ package body Sem_Ch6 is Remove (Body_To_Analyze); -- Keep separate checks needed when compiling without optimizations + -- AAMP and VM targets have no support for inlining in the backend + -- and hence we use frontend inlining at all optimization levels. - if Optimization_Level = 0 then - + if Optimization_Level = 0 + or else AAMP_On_Target + or else VM_Target /= No_VM + then -- Cannot inline functions whose body has a call that returns an -- unconstrained type since the secondary stack is involved, and -- it is not worth inlining. diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 665e399bf82..67fa2e0fd15 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -9422,7 +9422,13 @@ package body Sem_Util is function Must_Inline (Subp : Entity_Id) return Boolean is begin - return Optimization_Level = 0 + -- AAMP and VM targets have no support for inlining in the backend. + -- Hence we do as much inlining as possible in the front end. + + return + (Optimization_Level = 0 + or else AAMP_On_Target + or else VM_Target /= No_VM) and then Has_Pragma_Inline (Subp) and then (Has_Pragma_Inline_Always (Subp) or else Front_End_Inlining); end Must_Inline; -- 2.30.2