[Ada] Get rid of Disable_FE_Inline_Always

2020-06-04  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* adabkend.adb, back_end.ads, opt.ads, sem_ch6.adb: Get rid of
	Disable_FE_Inline_Always.
This commit is contained in:
Arnaud Charlet 2020-01-28 14:13:14 -05:00 committed by Pierre-Marie de Rodat
parent 198064c06a
commit 3ab26de1c0
4 changed files with 4 additions and 8 deletions

View File

@ -189,7 +189,6 @@ package body Adabkend is
elsif Switch_Chars (First .. Last) = "fno-inline" then
Lib.Store_Compilation_Switch (Switch_Chars);
Opt.Disable_FE_Inline := True;
Opt.Disable_FE_Inline_Always := True;
return;
-- Similar processing for -fpreserve-control-flow

View File

@ -67,7 +67,6 @@ package Back_End is
-- default for all of these in Opt is False).
--
-- Opt.Disable_FE_Inline
-- Opt.Disable_FE_Inline_Always
-- Opt.Suppress_Control_Float_Optimizations
-- Opt.Generate_SCO
-- Opt.Generate_SCO_Instance_Table

View File

@ -493,11 +493,10 @@ package Opt is
-- Set to False with switch -f of gnatclean and gprclean
Disable_FE_Inline : Boolean := False;
Disable_FE_Inline_Always : Boolean := False;
-- GNAT
-- Request to disable front end inlining from pragma Inline or pragma
-- Inline_Always out of the presence of the -fno-inline back end flag
-- on the command line, regardless of any other switches that are set.
-- Request to disable front end inlining from pragma Inline in the
-- presence of the -fno-inline back end flag on the command line,
-- regardless of any other switches that are set.
-- It remains the back end's reponsibility to honor -fno-inline at the
-- back end level.

View File

@ -4289,8 +4289,7 @@ package body Sem_Ch6 is
-- Legacy implementation (relying on front-end inlining)
if not Back_End_Inlining then
if (Has_Pragma_Inline_Always (Spec_Id)
and then not Opt.Disable_FE_Inline_Always)
if Has_Pragma_Inline_Always (Spec_Id)
or else (Front_End_Inlining
and then not Opt.Disable_FE_Inline)
then