Checkpoint_Load: replace access argument types with IN OUT modes

pmderodat · pmderodat · commit c1972f935725 · 2023-12-04T17:05:16.000Z
Now that we do not use streaming attributes anymore, it makes more sense
to use IN OUT modes for the Checkpoint_Load_State argument rather than
access types: no need to take 'Access or dereference once in a while.
diff --git a/tools/gnatcov/ali_files.adb b/tools/gnatcov/ali_files.adb
@@ -665,7 +665,7 @@ package body ALI_Files is
    end Read;
 
    procedure Read
-     (CLS   : access Checkpoints.Checkpoint_Load_State;
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
       Value : out ALI_Annotation_Maps.Map)
    is
       procedure Read_Map is new Checkpoints.Read_Map
@@ -677,7 +677,7 @@ package body ALI_Files is
          Read_Key     => Read,
          Read_Element => Read);
    begin
-      Read_Map (CLS.all, Value);
+      Read_Map (CLS, Value);
    end Read;
 
 end ALI_Files;
diff --git a/tools/gnatcov/ali_files.ads b/tools/gnatcov/ali_files.ads
@@ -77,7 +77,7 @@ package ALI_Files is
         Element_Type => ALI_Annotation);
 
    procedure Read
-     (CLS   : access Checkpoints.Checkpoint_Load_State;
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
       Value : out ALI_Annotation_Maps.Map);
    --  Read a ALI_Annotation_Maps.Map from CLS
 
diff --git a/tools/gnatcov/checkpoints.adb b/tools/gnatcov/checkpoints.adb
@@ -563,7 +563,7 @@ package body Checkpoints is
       Raise_Stub_Internal_Error_For (Load_Checkpoint);
 
       declare
-         CLS : aliased Checkpoint_Load_State :=
+         CLS : Checkpoint_Load_State :=
            (Root_Stream_Type with
             Stream   => Stream (SF),
             Filename => To_Unbounded_String (Filename),
@@ -645,11 +645,11 @@ package body Checkpoints is
          Update_Current_Trace_Kind
            (Any_Accepted_Trace_Kind'Val (CLS.Read_U8));
 
-         Files_Table.Checkpoint_Load (CLS'Access, Ignored_Source_Files);
-         SC_Obligations.Checkpoint_Load (CLS'Access);
-         Instrument.Checkpoints.Checkpoint_Load (CLS'Access);
-         Coverage.Source.Checkpoint_Load (CLS'Access);
-         Traces_Files_Registry.Checkpoint_Load (CLS'Access);
+         Files_Table.Checkpoint_Load (CLS, Ignored_Source_Files);
+         SC_Obligations.Checkpoint_Load (CLS);
+         Instrument.Checkpoints.Checkpoint_Load (CLS);
+         Coverage.Source.Checkpoint_Load (CLS);
+         Traces_Files_Registry.Checkpoint_Load (CLS);
 
          Free (CLS.Relocations);
       end;
diff --git a/tools/gnatcov/coverage-source.adb b/tools/gnatcov/coverage-source.adb
@@ -493,7 +493,7 @@ package body Coverage.Source is
    -- Checkpoint_Load --
    ---------------------
 
-   procedure Checkpoint_Load (CLS : access Checkpoint_Load_State) is
+   procedure Checkpoint_Load (CLS : in out Checkpoint_Load_State) is
       use SCI_Vector_Vectors;
 
       CP_Tag_Provider : Unbounded_String;
@@ -524,7 +524,7 @@ package body Coverage.Source is
       --  Even if we cannot merge coverage information, we must read it in
       --  order to be able to decode the rest of the checkpoint.
 
-      Read (CLS.all, CP_SCI_Vector);
+      Read (CLS, CP_SCI_Vector);
 
       if not Do_Merge then
          return;
diff --git a/tools/gnatcov/coverage-source.ads b/tools/gnatcov/coverage-source.ads
@@ -152,7 +152,7 @@ package Coverage.Source is
    procedure Checkpoint_Clear;
    --  Clear the internal data structures used to create checkpoints
 
-   procedure Checkpoint_Load (CLS : access Checkpoint_Load_State);
+   procedure Checkpoint_Load (CLS : in out Checkpoint_Load_State);
    --  Load checkpointed coverage state from S and merge into current state
 
 end Coverage.Source;
diff --git a/tools/gnatcov/files_table.adb b/tools/gnatcov/files_table.adb
@@ -1951,7 +1951,7 @@ package body Files_Table is
    ---------------------
 
    procedure Checkpoint_Load
-     (CLS                  : access Checkpoint_Load_State;
+     (CLS                  : in out Checkpoint_Load_State;
       Ignored_Source_Files : access GNAT.Regexp.Regexp)
    is
       pragma Assert
diff --git a/tools/gnatcov/files_table.ads b/tools/gnatcov/files_table.ads
@@ -573,7 +573,7 @@ package Files_Table is
    --  Clear the internal data structures used to create checkpoints
 
    procedure Checkpoint_Load
-     (CLS                  : access Checkpoints.Checkpoint_Load_State;
+     (CLS                  : in out Checkpoints.Checkpoint_Load_State;
       Ignored_Source_Files : access GNAT.Regexp.Regexp);
    --  Load checkpointed files table from S and merge in current state.
    --  Ignore_Source_Files should be null if the checkpoint purpose is
diff --git a/tools/gnatcov/instrument-checkpoints.adb b/tools/gnatcov/instrument-checkpoints.adb
@@ -48,14 +48,14 @@ package body Instrument.Checkpoints is
    -- Checkpoint_Load --
    ---------------------
 
-   procedure Checkpoint_Load (CLS : access Checkpoint_Load_State) is
+   procedure Checkpoint_Load (CLS : in out Checkpoint_Load_State) is
       Relocs : Checkpoint_Relocations renames CLS.Relocations;
    begin
       declare
          use Instrumented_Unit_To_CU_Maps;
          CP_IU_Map : Map;
       begin
-         Read (CLS.all, CP_IU_Map);
+         Read (CLS, CP_IU_Map);
 
          for Cur in CP_IU_Map.Iterate loop
             declare
@@ -99,7 +99,7 @@ package body Instrument.Checkpoints is
          CP_PP_Cmds : SFI_To_PP_Cmd_Maps.Map;
          CP_SFI     : Source_File_Index;
       begin
-         Read (CLS.all, CP_PP_Cmds);
+         Read (CLS, CP_PP_Cmds);
 
          for CP_Cur in CP_PP_Cmds.Iterate loop
 
diff --git a/tools/gnatcov/instrument-checkpoints.ads b/tools/gnatcov/instrument-checkpoints.ads
@@ -27,7 +27,7 @@ package Instrument.Checkpoints is
    procedure Checkpoint_Clear;
    --  Clear the internal data structures used to create checkpoints
 
-   procedure Checkpoint_Load (CLS : access Checkpoint_Load_State);
+   procedure Checkpoint_Load (CLS : in out Checkpoint_Load_State);
    --  Load instrumentation-specific data from stream and merge them in the
    --  current state.
 
diff --git a/tools/gnatcov/sc_obligations-bdd.adb b/tools/gnatcov/sc_obligations-bdd.adb
@@ -32,7 +32,7 @@ package body SC_Obligations.BDD is
    procedure Read (CLS : in out Checkpoint_Load_State; Value : out BDD_Node);
    --  Read a BDD_Node from CLS
 
-   procedure Read is new Read_Vector
+   procedure Read_BDD_Vector is new Read_Vector
      (Index_Type   => Valid_BDD_Node_Id,
       Element_Type => BDD_Node,
       "="          => "=",
@@ -132,7 +132,7 @@ package body SC_Obligations.BDD is
    ----------
 
    procedure Read
-     (CLS : access Checkpoints.Checkpoint_Load_State; Value : out BDD_Type) is
+     (CLS : in out Checkpoints.Checkpoint_Load_State; Value : out BDD_Type) is
    begin
       Value.Decision := CLS.Read_SCO;
       Value.Root_Condition := CLS.Read_BDD_Node;
@@ -173,10 +173,10 @@ package body SC_Obligations.BDD is
    end Read;
 
    procedure Read
-     (CLS    : access Checkpoints.Checkpoint_Load_State;
+     (CLS    : in out Checkpoints.Checkpoint_Load_State;
       Vector : out BDD_Vectors.Vector) is
    begin
-      Read (CLS.all, Vector);
+      Read_BDD_Vector (CLS, Vector);
    end Read;
 
    ---------------------
diff --git a/tools/gnatcov/sc_obligations-bdd.ads b/tools/gnatcov/sc_obligations-bdd.ads
@@ -90,7 +90,7 @@ private package SC_Obligations.BDD is
         Element_Type => BDD_Node);
 
    procedure Read
-     (CLS    : access Checkpoints.Checkpoint_Load_State;
+     (CLS    : in out Checkpoints.Checkpoint_Load_State;
       Vector : out BDD_Vectors.Vector);
    --  Read a BDD_Vectors.Vector from CLS
 
@@ -127,7 +127,7 @@ private package SC_Obligations.BDD is
    for BDD_Type'Write use Write;
 
    procedure Read
-     (CLS : access Checkpoints.Checkpoint_Load_State; Value : out BDD_Type);
+     (CLS : in out Checkpoints.Checkpoint_Load_State; Value : out BDD_Type);
    --  Read a BDD_Type from CLS
 
    procedure Allocate
diff --git a/tools/gnatcov/sc_obligations.adb b/tools/gnatcov/sc_obligations.adb
@@ -620,15 +620,15 @@ package body SC_Obligations is
       Read_Element => Read);
 
    procedure Checkpoint_Load_Merge_Unit
-     (CLS        : access Checkpoint_Load_State;
+     (CLS        : in out Checkpoint_Load_State;
       CP_Vectors : Source_Coverage_Vectors;
       CP_CU      : CU_Info;
       Real_CU_Id : CU_Id);
    --  Load CU from checkpoint that corresponds to a current unit of interest
    --  whose ID is Real_CU_Id.
 
    procedure Checkpoint_Load_New_Unit
-     (CLS        : access Checkpoint_Load_State;
+     (CLS        : in out Checkpoint_Load_State;
       CP_Vectors : Source_Coverage_Vectors;
       CP_CU      : in out CU_Info;
       CP_CU_Id   : CU_Id;
@@ -637,7 +637,7 @@ package body SC_Obligations is
    --  interest. The newly assigned CU_Id is returned in New_CU_Id.
 
    procedure Checkpoint_Load_Unit
-     (CLS        : access Checkpoint_Load_State;
+     (CLS        : in out Checkpoint_Load_State;
       CP_Vectors : Source_Coverage_Vectors;
       CP_CU      : in out CU_Info;
       CP_CU_Id   : CU_Id;
@@ -1039,7 +1039,7 @@ package body SC_Obligations is
          SCOD.D_Kind           := Decision_Kind'Val (CLS.Read_U8);
          SCOD.Control_Location := CLS.Read_Source_Location;
          SCOD.Last_Cond_Index  := CLS.Read_Condition;
-         SC_Obligations.BDD.Read (CLS'Access, SCOD.Decision_BDD);
+         SC_Obligations.BDD.Read (CLS, SCOD.Decision_BDD);
          SCOD.Degraded_Origins := CLS.Read_Boolean;
          SCOD.Aspect_Name      := Aspect_Id'Val (CLS.Read_U8);
          SCOD.Path_Count       := CLS.Read_Integer;
@@ -1068,7 +1068,7 @@ package body SC_Obligations is
    --------------------------------
 
    procedure Checkpoint_Load_Merge_Unit
-     (CLS        : access Checkpoint_Load_State;
+     (CLS        : in out Checkpoint_Load_State;
       CP_Vectors : Source_Coverage_Vectors;
       CP_CU      : CU_Info;
       Real_CU_Id : CU_Id)
@@ -1186,7 +1186,7 @@ package body SC_Obligations is
    ------------------------------
 
    procedure Checkpoint_Load_New_Unit
-     (CLS        : access Checkpoint_Load_State;
+     (CLS        : in out Checkpoint_Load_State;
       CP_Vectors : Source_Coverage_Vectors;
       CP_CU      : in out CU_Info;
       CP_CU_Id   : CU_Id;
@@ -1573,7 +1573,7 @@ package body SC_Obligations is
    --------------------------
 
    procedure Checkpoint_Load_Unit
-     (CLS        : access Checkpoint_Load_State;
+     (CLS        : in out Checkpoint_Load_State;
       CP_Vectors : Source_Coverage_Vectors;
       CP_CU      : in out CU_Info;
       CP_CU_Id   : CU_Id;
@@ -1749,23 +1749,23 @@ package body SC_Obligations is
    -- Checkpoint_Load --
    ---------------------
 
-   procedure Checkpoint_Load (CLS : access Checkpoint_Load_State) is
+   procedure Checkpoint_Load (CLS : in out Checkpoint_Load_State) is
       CP_Vectors : Source_Coverage_Vectors;
       Relocs     : Checkpoint_Relocations renames CLS.Relocations;
    begin
       --  Load data from stream
       --  This part must be kept consistent with Checkpoint_Save
 
-      Read (CLS.all, CP_Vectors.CU_Vector);
+      Read (CLS, CP_Vectors.CU_Vector);
       Read (CLS, CP_Vectors.ALI_Annotations);
-      Read (CLS.all, CP_Vectors.Inst_Vector);
+      Read (CLS, CP_Vectors.Inst_Vector);
       SC_Obligations.BDD.Read (CLS, CP_Vectors.BDD_Vector);
-      Read (CLS.all, CP_Vectors.SCO_Vector);
+      Read (CLS, CP_Vectors.SCO_Vector);
 
       --  Load non-instrumented information
 
-      Read (CLS.all, CP_Vectors.Non_Instr_SCOs);
-      Read (CLS.all, CP_Vectors.Non_Instr_MCDC_SCOs);
+      Read (CLS, CP_Vectors.Non_Instr_SCOs);
+      Read (CLS, CP_Vectors.Non_Instr_MCDC_SCOs);
 
       --  Allocate mapping tables for SCOs, instance identifiers and BDD nodes
 
diff --git a/tools/gnatcov/sc_obligations.ads b/tools/gnatcov/sc_obligations.ads
@@ -783,7 +783,7 @@ package SC_Obligations is
    procedure Checkpoint_Clear;
    --  Clear the internal data structures used to create checkpoints
 
-   procedure Checkpoint_Load (CLS : access Checkpoints.Checkpoint_Load_State);
+   procedure Checkpoint_Load (CLS : in out Checkpoints.Checkpoint_Load_State);
    --  Load checkpointed SCOs from stream and merge them in current state
 
    ---------------------------
diff --git a/tools/gnatcov/strings.adb b/tools/gnatcov/strings.adb
@@ -98,7 +98,7 @@ package body Strings is
    ----------
 
    procedure Read
-     (CLS   : access Checkpoints.Checkpoint_Load_State;
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
       Value : out String_Vectors.Vector)
    is
       procedure Read is new Read_Vector
@@ -108,11 +108,11 @@ package body Strings is
          Vectors      => String_Vectors,
          Read_Element => Read);
    begin
-      Read (CLS.all, Value);
+      Read (CLS, Value);
    end Read;
 
    procedure Read
-     (CLS   : access Checkpoints.Checkpoint_Load_State;
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
       Value : out String_Maps.Map)
    is
       procedure Read is new Read_Map
@@ -124,7 +124,7 @@ package body Strings is
          Read_Key     => Read,
          Read_Element => Read);
    begin
-      Read (CLS.all, Value);
+      Read (CLS, Value);
    end Read;
 
    --------------------
diff --git a/tools/gnatcov/strings.ads b/tools/gnatcov/strings.ads
@@ -70,7 +70,7 @@ package Strings is
       "="          => Ada.Strings.Unbounded."=");
 
    procedure Read
-     (CLS   : access Checkpoints.Checkpoint_Load_State;
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
       Value : out String_Vectors.Vector);
    --  Read a String_Vectors.Vector from CLS
 
@@ -81,7 +81,7 @@ package Strings is
       "="          => Ada.Strings.Unbounded."=");
 
    procedure Read
-     (CLS   : access Checkpoints.Checkpoint_Load_State;
+     (CLS   : in out Checkpoints.Checkpoint_Load_State;
       Value : out String_Maps.Map);
    --  Read a String_Maps.Map from CLS
 
diff --git a/tools/gnatcov/subprocesses.adb b/tools/gnatcov/subprocesses.adb
@@ -76,8 +76,8 @@ package body Subprocesses is
       Value : out Command_Type) is
    begin
       Value.Command := CLS.Read_Unbounded_String;
-      Read (CLS'Access, Value.Arguments);
-      Read (CLS'Access, Value.Environment);
+      Read (CLS, Value.Arguments);
+      Read (CLS, Value.Environment);
    end Read;
 
    ----------------
diff --git a/tools/gnatcov/traces_files_registry.adb b/tools/gnatcov/traces_files_registry.adb
@@ -370,7 +370,7 @@ package body Traces_Files_Registry is
    -- Checkpoint_Load --
    ---------------------
 
-   procedure Checkpoint_Load (CLS : access Checkpoints.Checkpoint_Load_State)
+   procedure Checkpoint_Load (CLS : in out Checkpoints.Checkpoint_Load_State)
    is
    begin
       loop
diff --git a/tools/gnatcov/traces_files_registry.ads b/tools/gnatcov/traces_files_registry.ads
@@ -106,7 +106,7 @@ package Traces_Files_Registry is
    procedure Checkpoint_Clear;
    --  Clear the internal data structures used to create checkpoints
 
-   procedure Checkpoint_Load (CLS : access Checkpoints.Checkpoint_Load_State);
+   procedure Checkpoint_Load (CLS : in out Checkpoints.Checkpoint_Load_State);
    --  Load list of trace files from S
 
 end Traces_Files_Registry;
