[Ada] T'Size in pragma Compile_Time_Error

2019-10-10  Bob Duff  <duff@adacore.com>

gcc/ada/

	* sem_prag.adb (Defer_Compile_Time_Warning_Error_To_BE): In
	addition to saving the pragma for further processing, copy the
	pragma into the main unit if necessary.

From-SVN: r276819

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 082fcf463a22736c1bcb21d1e3551d756924c042..0182d1858ade6f0c621094e3aa7fb97a87071c5b 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,5 @@
 2019-10-10  Bob Duff  <duff@adacore.com>
 
-       * einfo.ads, einfo.adb (Invariants_Ignored): New flag on types.
-       This leaves just one unused flag.
-       * sem_prag.adb (Invariant): Set the flag if appropriate.
-       * exp_util.adb (Make_Invariant_Call): Check the flag.
\ No newline at end of file
+       * sem_prag.adb (Defer_Compile_Time_Warning_Error_To_BE): In
+       addition to saving the pragma for further processing, copy the
+       pragma into the main unit if necessary.
\ No newline at end of file

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index f9ce1d9ae2568e5fe8611695c903e08ee2d6665f..fbfa0e04e1a850406c045b3579d0ffb321ac57d8 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -32197,6 +32197,15 @@ package body Sem_Prag is
         (New_Val => CTWE_Entry'(Eloc  => Sloc (Arg1),
                                 Scope => Current_Scope,
                                 Prag  => N));
+
+      --  If the Boolean expression contains T'Size, and we're not in the main
+      --  unit being compiled, then we need to copy the pragma into the main
+      --  unit, because otherwise T'Size might never be computed, leaving it
+      --  as 0.
+
+      if not In_Extended_Main_Code_Unit (N) then
+         Insert_Library_Level_Action (New_Copy_Tree (N));
+      end if;
    end Defer_Compile_Time_Warning_Error_To_BE;
 
    ------------------------------------------