OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Fix copy operation with private discriminated record type

Browse Source 
This prevents the object code from reading too many bytes from the
source for a copy operation involving a private discriminated record
type with default discriminants and generated for the assignment of an
aggregate to a variable or the initialization of a constant.

The front-end already knows that it needs to convert the operation
involving the aggregate into individual assignments if the type of the
aggregate has mutable components, but it would not do so if this type is
private, which does not change anything for code generation.

Running these commands:

  gnatmake -q p -g -fsanitize=address
  p

On the following sources:

with Q; use Q;

procedure P is

   type Rec is record
      A : T;
   end record;

   C : constant Rec := Rec'(A => Default_T);

begin
   null;
end;

package Q is

   type T is private;

   Default_T : constant T;

private

   A : constant := 170;
   B : constant := 8192;

   type A_Index is range 1 .. A;
   type B_Index is range 1 .. B;

   type A_Array is array (A_Index) of Boolean;
   type B_Array is array (B_Index) of Boolean;

   type Data_Type is (A_Type, B_Type);

   type T (Discriminant : Data_Type := A_Type) is record
      case Discriminant is
         when A_Type =>
            Field_A : A_Array;
         when B_Type =>
            Field_B : B_Array;
      end case;
   end record;

   Default_T : constant T :=
     T'(Discriminant => A_Type, Field_A => (others => True));

end Q;

Should execute silently.

2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* exp_aggr.adb (Has_Mutable_Components): Look at the underlying
	type of components to find out whether they are mutable.

From-SVN: r275954
This commit is contained in:
Eric Botcazou 2019-09-19 08:14:38 +00:00 committed by Pierre-Marie de Rodat
parent d53301c91f
commit bee475e2e0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2019-09-19 Eric Botcazou <ebotcazou@adacore.com>
* exp_aggr.adb (Has_Mutable_Components): Look at the underlying
type of components to find out whether they are mutable.
2019-09-19 Eric Botcazou <ebotcazou@adacore.com> 2019-09-19 Eric Botcazou <ebotcazou@adacore.com>
* sem_ch12.adb (Instantiate_Package_Body): Check that the body * sem_ch12.adb (Instantiate_Package_Body): Check that the body

8
gcc/ada/exp_aggr.adb
View File

@ -8162,13 +8162,15 @@ package body Exp_Aggr is
function Has_Mutable_Components (Typ : Entity_Id) return Boolean is function Has_Mutable_Components (Typ : Entity_Id) return Boolean is
Comp : Entity_Id; Comp : Entity_Id;
Ctyp : Entity_Id;
begin begin
Comp := First_Component (Typ); Comp := First_Component (Typ);
while Present (Comp) loop while Present (Comp) loop
if Is_Record_Type (Etype (Comp)) Ctyp := Underlying_Type (Etype (Comp));
and then Has_Discriminants (Etype (Comp)) if Is_Record_Type (Ctyp)
and then not Is_Constrained (Etype (Comp)) and then Has_Discriminants (Ctyp)
and then not Is_Constrained (Ctyp)
then then
return True; return True;
end if; end if;