public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-5652] ada: Further cleanup in finalization machinery
@ 2023-11-21 9:59 Marc Poulhi?s
0 siblings, 0 replies; only message in thread
From: Marc Poulhi?s @ 2023-11-21 9:59 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:6f69104c9e7cc455cc83139b063c08124e465f64
commit r14-5652-g6f69104c9e7cc455cc83139b063c08124e465f64
Author: Eric Botcazou <ebotcazou@adacore.com>
Date: Tue Oct 24 09:50:25 2023 +0200
ada: Further cleanup in finalization machinery
This removes the specific treatment of transient scopes in initialization
procedures, which is obsolete.
gcc/ada/
* exp_aggr.adb (Convert_To_Assignments): Do not treat initialization
procedures specially when it comes to creating a transient scope.
* exp_ch7.adb (Build_Finalizer.Process_Declarations): Likewise.
* exp_util.adb (Requires_Cleanup_Actions): Likewise.
Diff:
---
gcc/ada/exp_aggr.adb | 10 ++--------
gcc/ada/exp_ch7.adb | 29 -----------------------------
gcc/ada/exp_util.adb | 9 ---------
3 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index a6a54e892e2..691430a3e52 100644
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -4294,15 +4294,9 @@ package body Exp_Aggr is
return;
end if;
- -- Otherwise, if a transient scope is required, create it now. If we
- -- are within an initialization procedure do not create such, because
- -- the target of the assignment must not be declared within a local
- -- block, and because cleanup will take place on return from the
- -- initialization procedure.
+ -- Otherwise, if a transient scope is required, create it now
- -- Should the condition be more restrictive ???
-
- if Requires_Transient_Scope (Typ) and then not Inside_Init_Proc then
+ if Requires_Transient_Scope (Typ) then
Establish_Transient_Scope (N, Manage_Sec_Stack => False);
end if;
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 2e3da4cfaed..ef3b5c95d64 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -2479,35 +2479,6 @@ package body Exp_Ch7 is
and then Present (Library_Unit (Decl))
then
Process_Package_Body (Proper_Body (Unit (Library_Unit (Decl))));
-
- -- Handle a rare case caused by a controlled transient object
- -- created as part of a record init proc. The variable is wrapped
- -- in a block, but the block is not associated with a transient
- -- scope.
-
- elsif Nkind (Decl) = N_Block_Statement
- and then Inside_Init_Proc
- then
- Old_Counter_Val := Counter_Val;
-
- if Present (Handled_Statement_Sequence (Decl)) then
- Process_Declarations
- (Statements (Handled_Statement_Sequence (Decl)),
- Preprocess);
- end if;
-
- Process_Declarations (Declarations (Decl), Preprocess);
-
- -- Either the declaration or statement list of the block has a
- -- controlled object.
-
- if Preprocess
- and then Top_Level
- and then No (Last_Top_Level_Ctrl_Construct)
- and then Counter_Val > Old_Counter_Val
- then
- Last_Top_Level_Ctrl_Construct := Decl;
- end if;
end if;
Prev_Non_Pragma (Decl);
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 3b34e4659f1..3952a161bd7 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -13233,15 +13233,6 @@ package body Exp_Util is
then
return True;
end if;
-
- -- Handle a rare case caused by a controlled transient object created
- -- as part of a record init proc. The variable is wrapped in a block,
- -- but the block is not associated with a transient scope.
-
- elsif Nkind (Decl) = N_Block_Statement and then Inside_Init_Proc then
- if Requires_Cleanup_Actions (Decl, Lib_Level) then
- return True;
- end if;
end if;
Next (Decl);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-21 9:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-21 9:59 [gcc r14-5652] ada: Further cleanup in finalization machinery Marc Poulhi?s
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).