Merge branch 'pmderodat/ckpt_no_stream' into 'master'

Checkpoint_Load/Save: stop using streaming attributes for non-trivial types

Closes #157

See merge request eng/das/cov/gnatcoverage!337

Closes eng/das/cov/gnatcoverage#157

Author: pmderodat

tools/gnatcov/ali_files.adb

@@ -23,6 +23,7 @@ with Ada.Text_IO;             use Ada.Text_IO;
 with GNAT.Regpat; use GNAT.Regpat;
 with SCOs;
 
+with Checkpoints; use Checkpoints;
 with Diagnostics; use Diagnostics;
 with Files_Table; use Files_Table;
 with Get_SCOs;
@@ -31,6 +32,14 @@ with Outputs;     use Outputs;
 
 package body ALI_Files is
 
+   procedure Read
+     (CLS : in out Checkpoint_Load_State; Value : out ALI_Annotation);
+   --  Read a ALI_Annotation from CLS
+
+   procedure Write
+     (CSS : in out Checkpoint_Save_State; Value : ALI_Annotation);
+   --  Write a ALI_Annotation to CSS
+
    -----------------------------------------------
    -- Regular expressions for ALI files parsing --
    -----------------------------------------------
@@ -627,37 +636,69 @@ package body ALI_Files is
    ----------
 
    procedure Read
-     (S : access Root_Stream_Type'Class;
-      V : out ALI_Annotation)
-   is
+     (CLS : in out Checkpoint_Load_State; Value : out ALI_Annotation) is
    begin
-      CU_Id'Read (S, V.CU);
-      ALI_Annotation_Kind'Read (S, V.Kind);
+      Value.CU := CLS.Read_CU;
+      Value.Kind := ALI_Annotation_Kind'Val (CLS.Read_U8);
 
       declare
-         Msg : constant String := String'Input (S);
+         Msg : constant String := CLS.Read_String;
       begin
          if Msg'Length > 0 then
-            V.Message := new String'(Msg);
+            Value.Message := new String'(Msg);
          end if;
       end;
-      V.Violation_Count := 0;
-      V.Undetermined_Cov_Count := 0;
+
+      Value.Violation_Count := 0;
+      Value.Undetermined_Cov_Count := 0;
+   end Read;
+
+   procedure Read
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
+      Value : out ALI_Annotation_Maps.Map)
+   is
+      procedure Read_Map is new Checkpoints.Read_Map
+        (Key_Type     => Source_Location,
+         Element_Type => ALI_Annotation,
+         Map_Type     => ALI_Annotation_Maps.Map,
+         Clear        => ALI_Annotation_Maps.Clear,
+         Insert       => ALI_Annotation_Maps.Insert,
+         Read_Key     => Read,
+         Read_Element => Read);
+   begin
+      Read_Map (CLS, Value);
    end Read;
 
    -----------
    -- Write --
    -----------
 
-   procedure Write (S : access Root_Stream_Type'Class; V : ALI_Annotation) is
+   procedure Write (CSS : in out Checkpoint_Save_State; Value : ALI_Annotation)
+   is
    begin
-      CU_Id'Write (S, V.CU);
-      ALI_Annotation_Kind'Write (S, V.Kind);
-      if V.Message /= null then
-         String'Output (S, V.Message.all);
-      else
-         String'Output (S, "");
-      end if;
+      CSS.Write_CU (Value.CU);
+      CSS.Write_U8 (ALI_Annotation_Kind'Pos (Value.Kind));
+      CSS.Write_Unbounded (if Value.Message = null
+                           then ""
+                           else Value.Message.all);
+   end Write;
+
+   procedure Write
+     (CSS   : in out Checkpoints.Checkpoint_Save_State;
+      Value : ALI_Annotation_Maps.Map)
+   is
+      procedure Write_Map is new Checkpoints.Write_Map
+        (Key_Type      => Source_Location,
+         Element_Type  => ALI_Annotation,
+         Map_Type      => ALI_Annotation_Maps.Map,
+         Cursor_Type   => ALI_Annotation_Maps.Cursor,
+         Length        => ALI_Annotation_Maps.Length,
+         Iterate       => ALI_Annotation_Maps.Iterate,
+         Query_Element => ALI_Annotation_Maps.Query_Element,
+         Write_Key     => Write,
+         Write_Element => Write);
+   begin
+      Write_Map (CSS, Value);
    end Write;
 
 end ALI_Files;

tools/gnatcov/ali_files.ads

@@ -19,11 +19,11 @@
 --  ALI files reader
 
 with Ada.Containers.Ordered_Maps;
-with Ada.Streams; use Ada.Streams;
 
 with GNAT.Regexp;
 with GNAT.Strings; use GNAT.Strings;
 
+limited with Checkpoints;
 with SC_Obligations; use SC_Obligations;
 with Slocs; use Slocs;
 with Types; use Types;
@@ -67,16 +67,21 @@ package ALI_Files is
       --  This is relevant only for source trace based coverage analysis.
    end record;
 
-   procedure Read (S : access Root_Stream_Type'Class; V : out ALI_Annotation);
-   procedure Write (S : access Root_Stream_Type'Class; V : ALI_Annotation);
-   for ALI_Annotation'Read use Read;
-   for ALI_Annotation'Write use Write;
-
    package ALI_Annotation_Maps is
      new Ada.Containers.Ordered_Maps
        (Key_Type     => Source_Location,
         Element_Type => ALI_Annotation);
 
+   procedure Read
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
+      Value : out ALI_Annotation_Maps.Map);
+   --  Read a ALI_Annotation_Maps.Map from CLS
+
+   procedure Write
+     (CSS   : in out Checkpoints.Checkpoint_Save_State;
+      Value : ALI_Annotation_Maps.Map);
+   --  Write a ALI_Annotation_Maps.Map to CSS
+
    ALI_Annotations : ALI_Annotation_Maps.Map;
 
    function Load_ALI