diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-29 11:42:17 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-29 11:42:17 +0000 |
commit | ce73accb7f8da21f3726b9adfaaf1fee7b073490 (patch) | |
tree | 919c345adf1cf20ea091bae6919c55d8ce14434b /gcc/ada/exp_dbug.adb | |
parent | 96f971b264ac08da84b7ee420bea71f4ca8a4292 (diff) | |
download | gcc-ce73accb7f8da21f3726b9adfaaf1fee7b073490.tar.gz |
2012-10-29 Thomas Quinot <quinot@adacore.com>
* xoscons.adb: Minor reformatting.
2012-10-29 Yannick Moy <moy@adacore.com>
* exp_alfa.adb (Expand_Alfa): Backtrack change that removed
qualification of names in formal verification mode. Instead,
the qualification should be modified.
* exp_dbug.adb (Qualify_Entity_Name): Modify qualification in formal
verification mode, so that only a suffix is added to distinguish
homonyms from the same scope.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192940 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/exp_dbug.adb')
-rw-r--r-- | gcc/ada/exp_dbug.adb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb index b1db5859346..bcf6111a636 100644 --- a/gcc/ada/exp_dbug.adb +++ b/gcc/ada/exp_dbug.adb @@ -1307,6 +1307,20 @@ package body Exp_Dbug is if Has_Qualified_Name (Ent) then return; + -- In formal verification mode, simply append a suffix for homonyms, but + -- do not mark the name as being qualified. We used to qualify entity + -- names as full expansion does, but this was removed as this prevents + -- the verification back-end from using a short name for debugging and + -- user interaction. The verification back-end already takes care of + -- qualifying names when needed. + + elsif Alfa_Mode then + Get_Name_String (Chars (Ent)); + Append_Homonym_Number (Ent); + Output_Homonym_Numbers_Suffix; + Set_Chars (Ent, Name_Enter); + return; + -- If the entity is a variable encoding the debug name for an object -- renaming, then the qualified name of the entity associated with the -- renamed object can now be incorporated in the debug name. |