This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Ada] Entity names are not unique
- From: Pierre-Marie de Rodat <derodat at adacore dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Simon Buist <buist at adacore dot com>
- Date: Wed, 10 Jul 2019 05:03:33 -0400
- Subject: [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.
Tested on x86_64-pc-linux-gnu, committed on trunk
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.
--- gcc/ada/sem_util.adb
+++ 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;
--- gcc/ada/sem_util.ads
+++ 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