diff options
| author | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2017-11-08 16:04:35 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2017-11-08 16:04:35 +0000 |
| commit | 3e5400f4acc56a3e6a25ebeb5f7bfcf9d7d3646a (patch) | |
| tree | 989def40a76a3d4d1f669135a44fea83700b0cda /gcc/ada/spark_xrefs.adb | |
| parent | 013e9958f80bbba91f14dba7f1fa83ac9809ad7d (diff) | |
| download | gcc-3e5400f4acc56a3e6a25ebeb5f7bfcf9d7d3646a.zip gcc-3e5400f4acc56a3e6a25ebeb5f7bfcf9d7d3646a.tar.gz gcc-3e5400f4acc56a3e6a25ebeb5f7bfcf9d7d3646a.tar.bz2 | |
[multiple changes]
2017-11-08 Piotr Trojanek <trojanek@adacore.com>
* spark_xrefs.ads (SPARK_Xref_Record): Referenced object is now
represented by Entity_Id.
(SPARK_Scope_Record): Referenced scope (e.g. subprogram) is now
represented by Entity_Id; this information is not repeated as
Scope_Entity.
(Heap): Moved from lib-xref-spark_specific.adb, to reside next to
Name_Of_Heap_Variable.
* spark_xrefs.adb (dspark): Adapt debug routine to above changes in
data types.
* lib-xref-spark_specific.adb: Adapt routines for populating SPARK
scope and xrefs tables to above changes in data types.
2017-11-08 Justin Squirek <squirek@adacore.com>
* sem_ch8.adb (Mark_Use_Clauses): Add condition to always mark the
primitives of generic actuals.
(Mark_Use_Type): Add recursive call to properly mark class-wide type's
base type clauses as per ARM 8.4 (8.2/3).
2017-11-08 Ed Schonberg <schonberg@adacore.com>
* sem_ch6.adb (Analyze_Generic_Subprobram_Body): Validate
categorization dependency of the body, as is done for non-generic
units.
(New_Overloaded_Entity, Visible_Part_Type): Remove linear search
through declarations (Simple optimization, no behavior change).
From-SVN: r254539
Diffstat (limited to 'gcc/ada/spark_xrefs.adb')
| -rw-r--r-- | gcc/ada/spark_xrefs.adb | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gcc/ada/spark_xrefs.adb b/gcc/ada/spark_xrefs.adb index ebec6c4..e093139 100644 --- a/gcc/ada/spark_xrefs.adb +++ b/gcc/ada/spark_xrefs.adb @@ -23,7 +23,8 @@ -- -- ------------------------------------------------------------------------------ -with Output; use Output; +with Output; use Output; +with Sem_Util; use Sem_Util; package body SPARK_Xrefs is @@ -81,17 +82,13 @@ package body SPARK_Xrefs is Write_Int (Int (ASR.Scope_Num)); Write_Str (" Scope_Name = """); - if ASR.Scope_Name /= null then - Write_Str (ASR.Scope_Name.all); - end if; + Write_Str (Unique_Name (ASR.Scope_Id)); Write_Char ('"'); Write_Str (" From = "); Write_Int (Int (ASR.From_Xref)); Write_Str (" To = "); Write_Int (Int (ASR.To_Xref)); - Write_Str (" Scope_Entity = "); - Write_Int (Int (ASR.Scope_Entity)); Write_Eol; end; end loop; @@ -111,9 +108,7 @@ package body SPARK_Xrefs is Write_Int (Int (Index)); Write_Str (". Entity_Name = """); - if AXR.Entity_Name /= null then - Write_Str (AXR.Entity_Name.all); - end if; + Write_Str (Unique_Name (AXR.Entity)); Write_Char ('"'); Write_Str (" File_Num = "); |