diff options
Diffstat (limited to 'gcc/ada/exp_util.adb')
| -rw-r--r-- | gcc/ada/exp_util.adb | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 5a6fca0..e9ec7b7 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -1903,7 +1903,7 @@ package body Exp_Util is begin -- The DIC pragma is ignored, nothing left to do - if Is_Ignored (DIC_Prag) then + if Is_Ignored_In_Codegen (DIC_Prag) then null; -- Otherwise the DIC expression must be checked at run time. @@ -2311,8 +2311,7 @@ package body Exp_Util is Loc : constant Source_Ptr := Sloc (Typ); - Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; - Saved_IGR : constant Node_Id := Ignored_Ghost_Region; + Saved_Ghost_Config : constant Ghost_Config_Type := Ghost_Config; -- Save the Ghost-related attributes to restore on exit DIC_Prag : Node_Id; @@ -2558,7 +2557,7 @@ package body Exp_Util is end if; <<Leave>> - Restore_Ghost_Region (Saved_GM, Saved_IGR); + Restore_Ghost_Region (Saved_Ghost_Config); end Build_DIC_Procedure_Body; ------------------------------------- @@ -2575,8 +2574,7 @@ package body Exp_Util is is Loc : constant Source_Ptr := Sloc (Typ); - Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; - Saved_IGR : constant Node_Id := Ignored_Ghost_Region; + Saved_Ghost_Config : constant Ghost_Config_Type := Ghost_Config; -- Save the Ghost-related attributes to restore on exit DIC_Prag : Node_Id; @@ -2783,7 +2781,7 @@ package body Exp_Util is end if; <<Leave>> - Restore_Ghost_Region (Saved_GM, Saved_IGR); + Restore_Ghost_Region (Saved_Ghost_Config); end Build_DIC_Procedure_Declaration; ------------------------------------ @@ -3237,7 +3235,7 @@ package body Exp_Util is begin -- The invariant is ignored, nothing left to do - if Is_Ignored (Prag) then + if Is_Ignored_In_Codegen (Prag) then null; -- Otherwise the invariant is checked. Build a pragma Check to verify @@ -3709,8 +3707,7 @@ package body Exp_Util is -- Local variables - Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; - Saved_IGR : constant Node_Id := Ignored_Ghost_Region; + Saved_Ghost_Config : constant Ghost_Config_Type := Ghost_Config; -- Save the Ghost-related attributes to restore on exit Dummy : Entity_Id; @@ -4058,7 +4055,7 @@ package body Exp_Util is end if; <<Leave>> - Restore_Ghost_Region (Saved_GM, Saved_IGR); + Restore_Ghost_Region (Saved_Ghost_Config); end Build_Invariant_Procedure_Body; ------------------------------------------- @@ -4075,8 +4072,7 @@ package body Exp_Util is is Loc : constant Source_Ptr := Sloc (Typ); - Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; - Saved_IGR : constant Node_Id := Ignored_Ghost_Region; + Saved_Ghost_Config : constant Ghost_Config_Type := Ghost_Config; -- Save the Ghost-related attributes to restore on exit Proc_Decl : Node_Id; @@ -4292,7 +4288,7 @@ package body Exp_Util is end if; <<Leave>> - Restore_Ghost_Region (Saved_GM, Saved_IGR); + Restore_Ghost_Region (Saved_Ghost_Config); end Build_Invariant_Procedure_Declaration; ------------------------ @@ -10640,8 +10636,7 @@ package body Exp_Util is is Loc : constant Source_Ptr := Sloc (Expr); - Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; - Saved_IGR : constant Node_Id := Ignored_Ghost_Region; + Saved_Ghost_Config : constant Ghost_Config_Type := Ghost_Config; -- Save the Ghost-related attributes to restore on exit Call : Node_Id; @@ -10685,7 +10680,7 @@ package body Exp_Util is Name => New_Occurrence_Of (Func_Id, Loc), Parameter_Associations => Param_Assocs); - Restore_Ghost_Region (Saved_GM, Saved_IGR); + Restore_Ghost_Region (Saved_Ghost_Config); return Call; end Make_Predicate_Call; |