[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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 240bc087a66660dc32a6a872e780bd6b5aa44c14..c42498ef1769e2f7d15fbf1be1fb1a7e007440b4 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -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.

diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index f5c1f211cb5ada592d44b44aa43fce0ee0977629..4bbe86a933346fda92df29c73b1c520c3b58d265 100644 (file)
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -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);