[Ada] Entity names are not unique

This patch updates the Unique_Name procedure in order to prefix the
string "ada___" to child units that have a nested subprogram or package,
so that they do not clash with a parent package of the same name.

This is for GNATprove only and does not affect regular compilation.

2019-07-10  Simon Buist  <buist@adacore.com>

gcc/ada/

	* sem_util.ads (Child_Prefix): New constant.
	* sem_util.adb (Unique_Name): Add a special prefix to child
	units that have a nested subprogram or package.

From-SVN: r273343

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f99b6db923cc2ddb2cddcb65d298a67c426bed24..7e609bdc04932ccc9d6d057d09dd4bb9d85978ed 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-10  Simon Buist  <buist@adacore.com>
+
+       * sem_util.ads (Child_Prefix): New constant.
+       * sem_util.adb (Unique_Name): Add a special prefix to child
+       units that have a nested subprogram or package.
+
 2019-07-10  Arnaud Charlet  <charlet@adacore.com>
 
        * sfn_scan.adb (Scan_SFN_Pragmas): Add pragma Assert.

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index e011c099c19b18ce01009f4881c044b5bc369d5e..448eea15e6d0e622bba3d2bcaec568e029de6303 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -25781,6 +25781,8 @@ package body Sem_Util is
                   end if;
                end;
 
+            elsif Is_Child_Unit (U) then
+               return Child_Prefix & Unique_Name (S) & "__" & This_Name;
             else
                return Unique_Name (S) & "__" & This_Name;
             end if;

diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads
index 3eb9d57a94f2e8d9e1fd21c0f0fa1a7f83f52bd0..808d693525737e779f8df6cce01f8f24cde81140 100644 (file)
--- a/gcc/ada/sem_util.ads
+++ b/gcc/ada/sem_util.ads
@@ -2854,6 +2854,10 @@ package Sem_Util is
    --  Return a unique name for entity E, which could be used to identify E
    --  across compilation units.
 
+   Child_Prefix : constant String := "ada___";
+   --  Prefix for child packages when building a unique name for an entity. It
+   --  is included here to share between Unique_Name and gnatprove.
+
    function Unit_Is_Visible (U : Entity_Id) return Boolean;
    --  Determine whether a compilation unit is visible in the current context,
    --  because there is a with_clause that makes the unit available. Used to