[gcc r12-587] [Ada] Minor efficiency improvement in containers

[gcc r12-587] [Ada] Minor efficiency improvement in containers

[Pierre-Marie de Rodat]

https://gcc.gnu.org/g:0e1e07728074a7162c8173abd10bc32e814ea254

commit r12-587-g0e1e07728074a7162c8173abd10bc32e814ea254
Author: Bob Duff <duff@adacore.com>
Date:   Mon Jan 25 10:18:08 2021 -0500

    [Ada] Minor efficiency improvement in containers
    
    gcc/ada/
    
            * libgnat/a-conhel.adb (TC_Check): Move the Assert into the
            'if'.

Diff:
---
 gcc/ada/libgnat/a-conhel.adb | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gcc/ada/libgnat/a-conhel.adb b/gcc/ada/libgnat/a-conhel.adb
index 60928451adb..e7d82ac1636 100644
--- a/gcc/ada/libgnat/a-conhel.adb
+++ b/gcc/ada/libgnat/a-conhel.adb
@@ -122,17 +122,20 @@ package body Ada.Containers.Helpers is
 
       procedure TC_Check (T_Counts : Tamper_Counts) is
       begin
-         if T_Check and then T_Counts.Busy > 0 then
-            raise Program_Error with
-              "attempt to tamper with cursors";
+         if T_Check then
+            if T_Counts.Busy > 0 then
+               raise Program_Error with
+                 "attempt to tamper with cursors";
+            end if;
+
+            --  The lock status (which monitors "element tampering") always
+            --  implies that the busy status (which monitors "cursor
+            --  tampering") is set too; this is a representation invariant.
+            --  Thus if the busy count is zero, then the lock count
+            --  must also be zero.
+
+            pragma Assert (T_Counts.Lock = 0);
          end if;
-
-         --  The lock status (which monitors "element tampering") always
-         --  implies that the busy status (which monitors "cursor tampering")
-         --  is set too; this is a representation invariant. Thus if the busy
-         --  bit is not set, then the lock bit must not be set either.
-
-         pragma Assert (T_Counts.Lock = 0);
       end TC_Check;
 
       --------------