Use our local sloc type instead of Langkit_Support's sloc type

In both common instrumenter code and the C instrumenter, consistently
use gnatcov's own sloc type rather than the Langkit_Support's. This
makes more sense, as Langkit_Support is the native data type for
Libadalang (which only the Ada instrumenter uses) whereas the rest of
gnatcov uses gnatcov's own type.

Change-Id: I1122084df2cc7cd362ff7c8603339b98e12c80ee
TN: V728-002

Author: Jugst3r

tools/gnatcov/instrument-ada_unit.adb

@@ -269,6 +269,9 @@ package body Instrument.Ada_Unit is
    function Sloc (N : Ada_Node'Class) return Source_Location is
      (Start_Sloc (N.Sloc_Range));
 
+   function "+" (Sloc : Source_Location) return Slocs.Local_Source_Location
+   is ((Natural (Sloc.Line), Natural (Sloc.Column)));
+
    function Expr_Needs_Parens (Kind : Ada_Node_Kind_Type) return Boolean
    is (Kind in Ada_Quantified_Expr | Ada_If_Expr | Ada_Case_Expr);
    --  Whether nodes of type Kind must be wrapped with parens
@@ -3200,8 +3203,8 @@ package body Instrument.Ada_Unit is
                   Append_SCO
                     (C1   => '>',
                      C2   => Current_Dominant.K,
-                     From => From,
-                     To   => To,
+                     From => +From,
+                     To   => +To,
                      Last => False);
                end;
             end if;
@@ -3222,8 +3225,8 @@ package body Instrument.Ada_Unit is
                Append_SCO
                  (C1                 => 'S',
                   C2                 => SCE.Typ,
-                  From               => SCE.From,
-                  To                 => SCE.To,
+                  From               => +SCE.From,
+                  To                 => +SCE.To,
                   Last               => (J = SC_Last),
                   Pragma_Aspect_Name => Pragma_Aspect_Name);
 
@@ -4586,7 +4589,7 @@ package body Instrument.Ada_Unit is
                               end if;
 
                               UIC.Annotations.Append
-                                (Annotation_Couple'(Sloc (N), Ann));
+                                (Annotation_Couple'(+Sloc (N), Ann));
 
                            exception
                               when Constraint_Error =>
@@ -5346,8 +5349,8 @@ package body Instrument.Ada_Unit is
             Append_SCO
               (C1   => C1,
                C2   => C2,
-               From => Sloc (Op_N),
-               To   => No_Source_Location,
+               From => +Sloc (Op_N),
+               To   => Slocs.No_Local_Location,
                Last => False);
 
             Hash_Entries.Append ((Sloc (N), SCOs.SCO_Table.Last));
@@ -5402,8 +5405,8 @@ package body Instrument.Ada_Unit is
          Append_SCO
            (C1   => ' ',
             C2   => C2,
-            From => Start_Sloc (N_SR),
-            To   => Inclusive_End_Sloc (N_SR),
+            From => +Start_Sloc (N_SR),
+            To   => +Inclusive_End_Sloc (N_SR),
             Last => False);
          Hash_Entries.Append ((Start_Sloc (N_SR), SCOs.SCO_Table.Last));
       end Output_Element;
@@ -5481,8 +5484,8 @@ package body Instrument.Ada_Unit is
          Append_SCO
            (C1                 => T,
             C2                 => ' ',
-            From               => Loc,
-            To                 => No_Source_Location,
+            From               => +Loc,
+            To                 => Slocs.No_Local_Location,
             Last               => False,
             Pragma_Aspect_Name => Nam);
 

tools/gnatcov/instrument-c.adb

@@ -46,7 +46,6 @@ with Instrument.C_Utils;  use Instrument.C_Utils;
 with Outputs;             use Outputs;
 with Paths;               use Paths;
 with SCOs;
-with Slocs;
 with Subprocesses;        use Subprocesses;
 with Switches;            use Switches;
 with System;              use System;
@@ -145,7 +144,7 @@ package body Instrument.C is
       UIC                : in out C_Unit_Inst_Context'Class;
       N                  : Cursor_T;
       C1, C2             : Character;
-      From, To           : Source_Location;
+      From, To           : Local_Source_Location;
       Last               : Boolean;
       Pragma_Aspect_Name : Name_Id := Namet.No_Name);
    --  Append a SCO to SCOs.SCO_Table. Also partially fill the preprocessing
@@ -159,7 +158,7 @@ package body Instrument.C is
       UIC                : in out C_Unit_Inst_Context'Class;
       N                  : Cursor_T;
       C1, C2             : Character;
-      From, To           : Source_Location;
+      From, To           : Local_Source_Location;
       Last               : Boolean;
       Pragma_Aspect_Name : Name_Id := Namet.No_Name);
    --  Append a SCO to SCOs.SCO_Table, and complete the preprocessing info with
@@ -446,7 +445,7 @@ package body Instrument.C is
    begin
       while Has_Element (Cur) loop
          declare
-            Sloc    : constant Slocs.Source_Location := Key (Cur);
+            Sloc    : constant Source_Location := Key (Cur);
             LI      : constant Line_Info_Access := Get_Line (Sloc);
             Deleted : Boolean := False;
          begin
@@ -485,7 +484,7 @@ package body Instrument.C is
       UIC                : in out C_Unit_Inst_Context'Class;
       N                  : Cursor_T;
       C1, C2             : Character;
-      From, To           : Source_Location;
+      From, To           : Local_Source_Location;
       Last               : Boolean;
       Pragma_Aspect_Name : Name_Id := Namet.No_Name)
    is
@@ -508,13 +507,7 @@ package body Instrument.C is
       Get_Expansion_Location
         (Loc, File'Address, Line'Access, Column'Access, Offset'Access);
 
-      Info.Actual_Source_Range :=
-        (First_Sloc =>
-           (Line   => Integer (From.Line),
-            Column => Integer (From.Column)),
-         Last_Sloc  =>
-           (Line   => Integer (To.Line),
-            Column => Integer (To.Column)));
+      Info.Actual_Source_Range := (From, To);
 
       --  Check if this is comes from a macro expansion, in which case we need
       --  to record some information, for reporting purposes.
@@ -526,10 +519,10 @@ package body Instrument.C is
 
             Macro_Expansion_Name      : US.Unbounded_String;
             Immediate_Expansion_Loc_C : Source_Location_T;
-            Immediate_Expansion_Loc   : Slocs.Source_Location;
+            Immediate_Expansion_Loc   : Source_Location;
 
             Macro_Arg_Expanded_Loc_C : aliased Source_Location_T;
-            Macro_Arg_Expanded_Loc   : Slocs.Source_Location;
+            Macro_Arg_Expanded_Loc   : Source_Location;
          begin
 
             --  Note: macro arguments are completely macro-expanded before they
@@ -609,9 +602,7 @@ package body Instrument.C is
                     Get_Index_From_Generic_Name
                       (Name => Get_File_Name (File),
                        Kind => Source_File),
-                  L           =>
-                    (Line   => Integer (Line),
-                     Column => Integer (Column)));
+                  L           =>  (Natural (Line), Natural (Column)));
 
                Macro_Expansion_Name :=
                  +Get_Immediate_Macro_Name_For_Diagnostics
@@ -633,9 +624,7 @@ package body Instrument.C is
                     Get_Index_From_Generic_Name
                       (Name => Get_File_Name (File),
                        Kind => Source_File),
-                  L           =>
-                    (Line   => Integer (Line),
-                     Column => Integer (Column)));
+                  L           => (Natural (Line), Natural (Column)));
                Macro_Expansion_Name :=
                  +Get_Immediate_Macro_Name_For_Diagnostics (Loc, UIC.TU);
                Definition_Info :=
@@ -719,9 +708,7 @@ package body Instrument.C is
                     Get_Index_From_Generic_Name
                       (Name => Get_File_Name (File),
                        Kind => Source_File),
-                  L           =>
-                    (Line   => Integer (Line),
-                     Column => Integer (Column)));
+                  L           => (Natural (Line), Natural (Column)));
                Macro_Expansion_Name :=
                  +Get_Immediate_Macro_Name_For_Diagnostics (Loc, UIC.TU);
 
@@ -761,7 +748,7 @@ package body Instrument.C is
       UIC                : in out C_Unit_Inst_Context'Class;
       N                  : Cursor_T;
       C1, C2             : Character;
-      From, To           : Source_Location;
+      From, To           : Local_Source_Location;
       Last               : Boolean;
       Pragma_Aspect_Name : Name_Id := Namet.No_Name)
    is
@@ -1117,8 +1104,8 @@ package body Instrument.C is
       --  If not null, node where the witness call should be inserted.
       --  Otherwise, the insertion node will be N.
 
-      From : Source_Location;
-      To   : Source_Location;
+      From : Local_Source_Location;
+      To   : Local_Source_Location;
       Typ  : Character;
 
       Instr_Scheme : Instr_Scheme_Type := Instr_Stmt;
@@ -1261,7 +1248,7 @@ package body Instrument.C is
       --  Likewise for the putative SCO_Raw_Hash_Table entries: see below
 
       type Hash_Entry is record
-         Sloc      : Source_Location;
+         Sloc      : Local_Source_Location;
          SCO_Index : Nat;
       end record;
       --  We must register all conditions/pragmas in SCO_Raw_Hash_Table.
@@ -1388,7 +1375,7 @@ package body Instrument.C is
                C1   => C1,
                C2   => C2,
                From => Sloc (Get_Operator_Loc (N)),
-               To   => No_Source_Location,
+               To   => No_Local_Location,
                Last => False);
 
             Hash_Entries.Append ((Sloc      => Start_Sloc (N),
@@ -1973,8 +1960,8 @@ package body Instrument.C is
       is
          Insert_Cursor : aliased Cursor_T := N;
 
-         F : constant Source_Location := Start_Sloc (N);
-         T : Source_Location := End_Sloc (N);
+         F : constant Local_Source_Location := Start_Sloc (N);
+         T : Local_Source_Location := End_Sloc (N);
          --  Source location bounds used to produce a SCO statement. By
          --  default, this should cover the same source location range as N,
          --  however for nodes that can contain other statements, we select an
@@ -2037,9 +2024,9 @@ package body Instrument.C is
 
             if J = SC_First and then Current_Dominant /= No_Dominant then
                declare
-                  From : constant Source_Location :=
+                  From : constant Local_Source_Location :=
                     Start_Sloc (Current_Dominant.N);
-                  To   : constant Source_Location :=
+                  To   : constant Local_Source_Location :=
                     End_Sloc (Current_Dominant.N);
 
                begin

tools/gnatcov/instrument-c.ads

@@ -25,8 +25,6 @@ with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 
 with GNATCOLL.Projects;
 
-with Langkit_Support.Slocs; use Langkit_Support.Slocs;
-
 with Namet; use Namet;
 with Types; use Types;
 
@@ -36,6 +34,7 @@ with Clang.Rewrite; use Clang.Rewrite;
 with Instrument.Base_Types; use Instrument.Base_Types;
 with Instrument.Common;     use Instrument.Common;
 with SC_Obligations;        use SC_Obligations;
+with Slocs;                 use Slocs;
 with Strings;               use Strings;
 
 private package Instrument.C is
@@ -302,7 +301,7 @@ private
       UIC                : in out C_Unit_Inst_Context'Class;
       N                  : Cursor_T;
       C1, C2             : Character;
-      From, To           : Source_Location;
+      From, To           : Local_Source_Location;
       Last               : Boolean;
       Pragma_Aspect_Name : Name_Id := Namet.No_Name) is null;
 

tools/gnatcov/instrument-c_utils.adb

@@ -33,22 +33,21 @@ package body Instrument.C_Utils is
    -- Sloc --
    ----------
 
-   function Sloc (Loc : Source_Location_T) return Source_Location is
+   function Sloc (Loc : Source_Location_T) return Local_Source_Location is
       Line, Column : aliased Interfaces.C.unsigned;
    begin
       Get_Presumed_Location (Location => Loc,
                              Filename => null,
                              Line     => Line'Access,
                              Column   => Column'Access);
-      return (Line   => Langkit_Support.Slocs.Line_Number (Line),
-              Column => Langkit_Support.Slocs.Column_Number (Column));
+      return (Natural (Line), Natural (Column));
    end Sloc;
 
    ----------------
    -- Start_Sloc --
    ----------------
 
-   function Start_Sloc (N : Cursor_T) return Source_Location is
+   function Start_Sloc (N : Cursor_T) return Local_Source_Location is
       Line, Column : aliased Interfaces.C.unsigned;
       Loc          : constant Source_Location_T :=
         Get_Range_Start (Get_Cursor_Extent (N));
@@ -57,15 +56,14 @@ package body Instrument.C_Utils is
                              Filename => null,
                              Line     => Line'Access,
                              Column   => Column'Access);
-      return (Line   => Langkit_Support.Slocs.Line_Number (Line),
-              Column => Langkit_Support.Slocs.Column_Number (Column));
+      return (Natural (Line), Natural (Column));
    end Start_Sloc;
 
    --------------
    -- End_Sloc --
    --------------
 
-   function End_Sloc (N : Cursor_T) return Source_Location is
+   function End_Sloc (N : Cursor_T) return Local_Source_Location is
       Line, Column : aliased Interfaces.C.unsigned;
       Loc          : Source_Location_T :=
         Get_Range_End (Get_Cursor_Extent (N));
@@ -78,8 +76,7 @@ package body Instrument.C_Utils is
          Filename => null,
          Line     => Line'Access,
          Column   => Column'Access);
-      return (Line   => Langkit_Support.Slocs.Line_Number (Line),
-              Column => Langkit_Support.Slocs.Column_Number (Column));
+      return (Natural (Line), Natural (Column));
    end End_Sloc;
 
    ----------

tools/gnatcov/instrument-c_utils.ads

@@ -22,7 +22,7 @@ with Ada.Containers.Vectors;
 with Clang.Index;   use Clang.Index;
 with Clang.Rewrite; use Clang.Rewrite;
 
-with Langkit_Support.Slocs; use Langkit_Support.Slocs;
+with Slocs; use Slocs;
 
 package Instrument.C_Utils is
 
@@ -37,13 +37,13 @@ package Instrument.C_Utils is
    --  Location utilities --
    -------------------------
 
-   function Sloc (Loc : Source_Location_T) return Source_Location;
+   function Sloc (Loc : Source_Location_T) return Local_Source_Location;
    --  Convert a Source_Location_T to a Source_Location
 
-   function Start_Sloc (N : Cursor_T) return Source_Location;
+   function Start_Sloc (N : Cursor_T) return Local_Source_Location;
    --  Return the starting location of a node
 
-   function End_Sloc (N : Cursor_T) return Source_Location;
+   function End_Sloc (N : Cursor_T) return Local_Source_Location;
    --  Return the end location of a node
 
    function Kind (N : Cursor_T) return Cursor_Kind_T;

tools/gnatcov/instrument-common.adb

@@ -720,10 +720,9 @@ package body Instrument.Common is
    begin
       for Couple of UIC.Annotations loop
          declare
-            Sloc : constant Slocs.Source_Location :=
+            Sloc : constant Source_Location :=
                (Source_File => UIC.SFI,
-                L           => (Line   => Positive (Couple.Sloc.Line),
-                                Column => Positive (Couple.Sloc.Column)));
+                L           => Couple.Sloc);
          begin
             Couple.Annotation.CU := UIC.CU;
             ALI_Annotations.Insert
@@ -738,22 +737,20 @@ package body Instrument.Common is
 
    procedure Append_SCO
      (C1, C2             : Character;
-      From, To           : Source_Location;
+      From, To           : Local_Source_Location;
       Last               : Boolean;
       Pragma_Aspect_Name : Name_Id := Namet.No_Name)
    is
    begin
       SCOs.SCO_Table.Append
-        ((From =>
-              (Line => Logical_Line_Number (From.Line),
-               Col  => Standard.Types.Column_Number (From.Column)),
-          To   =>
-              (Line => Logical_Line_Number (To.Line),
-               Col  => Standard.Types.Column_Number (To.Column)),
-          C1   => C1,
-          C2   => C2,
-          Last => Last,
-          Pragma_Sloc        => No_Location,
+        ((From               =>
+            (Logical_Line_Number (From.Line), Column_Number (From.Column)),
+          To                 =>
+            (Logical_Line_Number (To.Line), Column_Number (To.Column)),
+          C1                 => C1,
+          C2                 => C2,
+          Last               => Last,
+          Pragma_Sloc        => Types.No_Location,
           Pragma_Aspect_Name => Pragma_Aspect_Name));
    end Append_SCO;