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

[Ada] Avoid gnatbind regression caused by Copy_Bitfield 

The recent Copy_Bitfield change caused gnatbind to change elaboration
order, causing different error messages.

2019-09-18  Bob Duff  <duff@adacore.com>

gcc/ada/

	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Move call
	to RTE_Available later, so it doesn't disturb the elab order.
	The RE_Copy_Bitfield entity is defined in package
	System.Bitfields which has a dependency on package
	System.Bitfield_Utils, which has it its spec:

	   pragma Elaborate_Body;

	The query on RTE_Available forces loading and analyzing
	System.Bitfields and all its withed units.

From-SVN: r275866
This commit is contained in:
Bob Duff 2019-09-18 08:33:49 +00:00 committed by Pierre-Marie de Rodat
parent 5c13a04e0d
commit 58ab1e7607
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ada/ChangeLog
View File

@ -1,3 +1,14 @@
2019-09-18 Bob Duff <duff@adacore.com>
* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Move call
to RTE_Available later, so it doesn't disturb the elab order.
The RE_Copy_Bitfield entity is defined in package
System.Bitfields which has a dependency on package
System.Bitfield_Utils, which has it its spec:
pragma Elaborate_Body;
The query on RTE_Available forces loading and analyzing
System.Bitfields and all its withed units.
2019-09-18 Eric Botcazou <ebotcazou@adacore.com>
* checks.ads (Alignment_Warnings_Record): Add P component.

4
gcc/ada/exp_ch5.adb
View File

@ -1475,8 +1475,7 @@ package body Exp_Ch5 is
-- optimization in that case as well. We could complicate this code by
-- actually looking for such volatile and independent components.
if RTE_Available (RE_Copy_Bitfield)
and then Is_Bit_Packed_Array (L_Type)
if Is_Bit_Packed_Array (L_Type)
and then Is_Bit_Packed_Array (R_Type)
and then not Reverse_Storage_Order (L_Type)
and then not Reverse_Storage_Order (R_Type)
@ -1489,6 +1488,7 @@ package body Exp_Ch5 is
and then not Has_Independent_Components (R_Type)
and then not L_Prefix_Comp
and then not R_Prefix_Comp
and then RTE_Available (RE_Copy_Bitfield)
then
return Expand_Assign_Array_Bitfield
(N, Larray, Rarray, L_Type, R_Type, Rev);