diff mbox series

[Ada] Improve support for casing on types with controlled parts

Message ID 20220105113357.GA2716373@adacore.com
State New
Headers show
Series [Ada] Improve support for casing on types with controlled parts | expand

Commit Message

Pierre-Marie de Rodat Jan. 5, 2022, 11:33 a.m. UTC 
INOX allows casing on composite values. In some cases of bindings for
subcomponents, the compiler introduced copying which led to compiler
failures associated with finalizing those copies. In such cases a bound
object now provides a constant view of the appropriate subcomponent of
the selector object, not a copy thereof.

Tested on x86_64-pc-linux-gnu, committed on trunk

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.
diff mbox series

Patch

diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
--- 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,