diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2017-11-08 16:22:37 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2017-11-08 16:22:37 +0000 |
| commit | 00b3de222b3bc8eff6fb95219d7aa963b7fd277d (patch) | |
| tree | 68e9d29437fbd16289d4635c8b95698feee21e93 /gcc/ada | |
| parent | 784ef0fb7cd3e6bdf8cdba51a14cd884f365cb59 (diff) | |
| download | gcc-00b3de222b3bc8eff6fb95219d7aa963b7fd277d.zip gcc-00b3de222b3bc8eff6fb95219d7aa963b7fd277d.tar.gz gcc-00b3de222b3bc8eff6fb95219d7aa963b7fd277d.tar.bz2 | |
spark_xrefs.ads (SPARK_File_Record): Remove string components.
2017-11-08 Piotr Trojanek <trojanek@adacore.com>
* spark_xrefs.ads (SPARK_File_Record): Remove string components.
* spark_xrefs.adb (dspark): Remove pretty-printing of removed
SPARK_File_Record components.
* lib-xref-spark_specific.adb (Add_SPARK_File): Do not store string
representation of files/units.
From-SVN: r254541
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/lib-xref-spark_specific.adb | 30 | ||||
| -rw-r--r-- | gcc/ada/spark_xrefs.adb | 7 | ||||
| -rw-r--r-- | gcc/ada/spark_xrefs.ads | 7 |
4 files changed, 11 insertions, 41 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1a4a582..2e5c0c4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,13 @@ 2017-11-08 Piotr Trojanek <trojanek@adacore.com> + * spark_xrefs.ads (SPARK_File_Record): Remove string components. + * spark_xrefs.adb (dspark): Remove pretty-printing of removed + SPARK_File_Record components. + * lib-xref-spark_specific.adb (Add_SPARK_File): Do not store string + representation of files/units. + +2017-11-08 Piotr Trojanek <trojanek@adacore.com> + * lib-xref.ads, lib-xref-spark_specific.adb (Traverse_Declarations): Remove Inside_Stubs parameter. diff --git a/gcc/ada/lib-xref-spark_specific.adb b/gcc/ada/lib-xref-spark_specific.adb index c43cbb1..300706a 100644 --- a/gcc/ada/lib-xref-spark_specific.adb +++ b/gcc/ada/lib-xref-spark_specific.adb @@ -208,11 +208,6 @@ package body SPARK_Specific is procedure Traverse_Scopes is new Traverse_Compilation_Unit (Detect_And_Add_SPARK_Scope); - -- Local variables - - File_Name : String_Ptr; - Unit_File_Name : String_Ptr; - -- Start of processing for Add_SPARK_File begin @@ -240,29 +235,10 @@ package body SPARK_Specific is Traverse_Scopes (CU => Cunit (Ubody)); end if; - -- Make entry for new file in file table - - Get_Name_String (Reference_Name (File)); - File_Name := new String'(Name_Buffer (1 .. Name_Len)); - - -- For subunits, also retrieve the file name of the unit. Only do so if - -- unit has an associated compilation unit. - - if Present (Cunit (Unit (File))) - and then Nkind (Unit (Cunit (Unit (File)))) = N_Subunit - then - Get_Name_String (Reference_Name (Main_Source_File)); - Unit_File_Name := new String'(Name_Buffer (1 .. Name_Len)); - else - Unit_File_Name := null; - end if; - SPARK_File_Table.Append ( - (File_Name => File_Name, - Unit_File_Name => Unit_File_Name, - File_Num => Dspec, - From_Scope => From, - To_Scope => SPARK_Scope_Table.Last)); + (File_Num => Dspec, + From_Scope => From, + To_Scope => SPARK_Scope_Table.Last)); end Add_SPARK_File; --------------------- diff --git a/gcc/ada/spark_xrefs.adb b/gcc/ada/spark_xrefs.adb index e093139..9461c96 100644 --- a/gcc/ada/spark_xrefs.adb +++ b/gcc/ada/spark_xrefs.adb @@ -48,13 +48,6 @@ package body SPARK_Xrefs is Write_Int (Int (Index)); Write_Str (". File_Num = "); Write_Int (Int (AFR.File_Num)); - Write_Str (" File_Name = """); - - if AFR.File_Name /= null then - Write_Str (AFR.File_Name.all); - end if; - - Write_Char ('"'); Write_Str (" From = "); Write_Int (Int (AFR.From_Scope)); Write_Str (" To = "); diff --git a/gcc/ada/spark_xrefs.ads b/gcc/ada/spark_xrefs.ads index e4f1eef..7ac0901 100644 --- a/gcc/ada/spark_xrefs.ads +++ b/gcc/ada/spark_xrefs.ads @@ -154,13 +154,6 @@ package SPARK_Xrefs is -- entries have been constructed. type SPARK_File_Record is record - File_Name : String_Ptr; - -- Pointer to file name in ALI file - - Unit_File_Name : String_Ptr; - -- Pointer to file name for unit in ALI file, when File_Name refers to a - -- subunit; otherwise null. - File_Num : Nat; -- Dependency number in ALI file |