[Ada] Strengthen Locked flag
diff mbox series

Message ID 20190814095313.GA52246@adacore.com
State New
Headers show
Series
  • [Ada] Strengthen Locked flag
Related show

Commit Message

Pierre-Marie de Rodat Aug. 14, 2019, 9:53 a.m. UTC
This patch strengthens the Locked flag, by Asserting that it is False on
operations that might cause reallocation.

No change in behavior (except in the presence of compiler bugs), so no
test.

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

2019-08-14  Bob Duff  <duff@adacore.com>

gcc/ada/

	* table.adb: Assert that the table is not locked when increasing
	Last, even if it doesn't cause reallocation.  In other words,
	assert that on operations that MIGHT cause reallocation.
	* table.ads: Fix comment accordingly.

Patch
diff mbox series

--- gcc/ada/table.adb
+++ gcc/ada/table.adb
@@ -80,6 +80,7 @@  package body Table is
 
       procedure Append (New_Val : Table_Component_Type) is
       begin
+         pragma Assert (not Locked);
          Set_Item (Table_Index_Type (Last_Val + 1), New_Val);
       end Append;
 
@@ -120,6 +121,7 @@  package body Table is
 
       procedure Increment_Last is
       begin
+         pragma Assert (not Locked);
          Last_Val := Last_Val + 1;
 
          if Last_Val > Max then
@@ -384,6 +386,8 @@  package body Table is
 
       procedure Set_Last (New_Val : Table_Index_Type) is
       begin
+         pragma Assert (Int (New_Val) <= Last_Val or else not Locked);
+
          if Int (New_Val) < Last_Val then
             Last_Val := Int (New_Val);
 

--- gcc/ada/table.ads
+++ gcc/ada/table.ads
@@ -130,14 +130,15 @@  package Table is
       --  First .. Last.
 
       Locked : Boolean := False;
-      --  Table expansion is permitted only if this switch is set to False. A
-      --  client may set Locked to True, in which case any attempt to expand
-      --  the table will cause an assertion failure. Note that while a table
-      --  is locked, its address in memory remains fixed and unchanging. This
-      --  feature is used to control table expansion during Gigi processing.
-      --  Gigi assumes that tables other than the Uint and Ureal tables do
-      --  not move during processing, which means that they cannot be expanded.
-      --  The Locked flag is used to enforce this restriction.
+      --  Increasing the value of Last is permitted only if this switch is set
+      --  to False. A client may set Locked to True, in which case any attempt
+      --  to increase the value of Last (which might expand the table) will
+      --  cause an assertion failure. Note that while a table is locked, its
+      --  address in memory remains fixed and unchanging. This feature is used
+      --  to control table expansion during Gigi processing.  Gigi assumes that
+      --  tables other than the Uint and Ureal tables do not move during
+      --  processing, which means that they cannot be expanded.  The Locked
+      --  flag is used to enforce this restriction.
 
       procedure Init;
       --  This procedure allocates a new table of size Initial (freeing any