diff options
| author | Steve Baird <baird@adacore.com> | 2021-12-01 11:02:52 -0800 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-01-05 11:32:38 +0000 |
| commit | 5e51d85e2e739cbe8a0c7081d300c12c5b5447b2 (patch) | |
| tree | fe9d06f1a26da58591eac58dadb580c8e68c576c /gcc | |
| parent | a7b4fbd9b4c2c24bac956125068d2540976bf90e (diff) | |
| download | gcc-5e51d85e2e739cbe8a0c7081d300c12c5b5447b2.zip gcc-5e51d85e2e739cbe8a0c7081d300c12c5b5447b2.tar.gz gcc-5e51d85e2e739cbe8a0c7081d300c12c5b5447b2.tar.bz2 | |
[Ada] Improve support for casing on types with controlled parts
gcc/ada/
* exp_ch5.adb (Finish_Binding_Object_Declaration): Fix a bug
that was introduced in the previous commit. The previous
version initialized a Boolean constant Declare_Copy before the
variable Decl had been initialized properly.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_ch5.adb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb index 42cffd5..b73a966 100644 --- a/gcc/ada/exp_ch5.adb +++ b/gcc/ada/exp_ch5.adb @@ -3392,12 +3392,12 @@ package body Exp_Ch5 is Decl : Node_Id := First (Declarations (Block_Stmt)); Def_Id : Node_Id := Empty; + function Declare_Copy (Decl : Node_Id) return Boolean is + (Nkind (Decl) = N_Object_Declaration); -- Declare_Copy indicates which of the two approaches -- was chosen during analysis: declare (and initialize) -- a new variable, or use access values to declare a renaming -- of the appropriate subcomponent of the selector value. - Declare_Copy : constant Boolean := - Nkind (Decl) = N_Object_Declaration; function Make_Conditional (Stmt : Node_Id) return Node_Id; -- If there is only one choice for this alternative, then @@ -3443,7 +3443,7 @@ package body Exp_Ch5 is end loop; -- For a binding object, we sometimes make a copy and - -- sometimes introduce a renaming. That decision is made + -- sometimes introduce a renaming. That decision is made -- elsewhere. The renaming case involves dereferencing an -- access value because of the possibility of multiple -- choices (with multiple binding definitions) for a single @@ -3452,7 +3452,7 @@ package body Exp_Ch5 is -- renaming case, we initialize (again, maybe conditionally) -- the access value. - if Declare_Copy then + if Declare_Copy (Decl) then declare Assign_Value : constant Node_Id := Make_Assignment_Statement (Loc, |