Commit 1ae0159e by Simon Buist Committed by Pierre-Marie de Rodat

[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
parent f35688c9
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.
......
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment