Fix live-observability regressions for block instrumentation

Author: RenjiSann

testsuite/tests/345-live-observability/test.py

@@ -24,18 +24,31 @@
     extra_coverage_args=[],
 )
 
+# In case block instrumentation is enabled, the number of bits set to 1 in the
+# buffers is not equivalent to the number of statements executed.
+if thistest.options.block:
+    counts = [0, 0, 3]
+else:
+    counts = [2, 4, 8]
+
 OUTPUT = contents_of("main_output.txt")
 
 thistest.fail_if_no_match(
-    "Wrong first buffer sum", re.compile(r".*First: *2.*", re.S), OUTPUT
+    "Wrong first buffer sum",
+    re.compile(f".*First: *{counts[0]}.*", re.S),
+    OUTPUT,
 )
 
 thistest.fail_if_no_match(
-    "Wrong second buffer sum", re.compile(r".*Second: *4.*", re.S), OUTPUT
+    "Wrong second buffer sum",
+    re.compile(f".*Second: *{counts[1]}.*", re.S),
+    OUTPUT,
 )
 
 thistest.fail_if_no_match(
-    "Wrong third buffer sum", re.compile(r".*Third: *8.*", re.S), OUTPUT
+    "Wrong third buffer sum",
+    re.compile(f".*Third: *{counts[2]}.*", re.S),
+    OUTPUT,
 )
 
 thistest.result()

tools/gnatcov/instrument-ada_unit.adb

@@ -11152,15 +11152,15 @@ package body Instrument.Ada_Unit is
       Create_File (Prj, Body_File, Obs_Body_Filename);
 
       Spec_File.Put_Line ("package " & Obs_Unit_Name & " is");
-      Spec_File.Put_Line ("   function Sum_Buffer_Bits return Positive;");
+      Spec_File.Put_Line ("   function Sum_Buffer_Bits return Natural;");
       Spec_File.Put_Line ("end " & Obs_Unit_Name & ";");
 
       Body_File.Put_Line ("with Interfaces.C;");
       Body_File.Put_Line
         ("with GNATcov_RTS.Buffers.Lists; use GNATcov_RTS.Buffers.Lists;");
       Body_File.New_Line;
       Body_File.Put_Line ("package body " & Obs_Unit_Name & " is");
-      Body_File.Put_Line ("   function Sum_Buffer_Bits return Positive is");
+      Body_File.Put_Line ("   function Sum_Buffer_Bits return Natural is");
       Body_File.Put_Line ("      function Sum_Buffer_Bits_C");
       Body_File.Put_Line
         ("        (C_List : GNATcov_RTS_Coverage_Buffers_Group_Array)");
@@ -11170,7 +11170,7 @@ package body Instrument.Ada_Unit is
          & " ""gnatcov_rts_sum_buffer_bits"");");
       Body_File.Put_Line ("   begin");
       Body_File.Put_Line
-        ("      return Positive(Sum_Buffer_Bits_C ("
+        ("      return Natural(Sum_Buffer_Bits_C ("
          & Buf_List_Unit_Name & ".C_List));");
       Body_File.Put_Line ("   end;");
       Body_File.Put_Line ("end " & Obs_Unit_Name & ";");