diff options
Diffstat (limited to 'gcc/ada/exp_dbug.adb')
| -rw-r--r-- | gcc/ada/exp_dbug.adb | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb index 76ae0ca..ac86891 100644 --- a/gcc/ada/exp_dbug.adb +++ b/gcc/ada/exp_dbug.adb @@ -1011,17 +1011,25 @@ package body Exp_Dbug is E := Defining_Entity (Name_Qualify_Units.Table (J)); Qualify_Entity_Name (E); - Ent := First_Entity (E); - while Present (Ent) loop - Qualify_Entity_Name (Ent); - Next_Entity (Ent); - - -- There are odd cases where Last_Entity (E) = E. This happens - -- in the case of renaming of packages. This test avoids getting - -- stuck in such cases. - - exit when Ent = E; - end loop; + -- Normally entities in the qualification list are scopes, but in the + -- case of a library-level package renaming there is an associated + -- variable that encodes the debugger name and that variable is + -- entered in the list since it occurs in the Aux_Decls list of the + -- compilation and doesn't have a normal scope. + + if Ekind (E) /= E_Variable then + Ent := First_Entity (E); + while Present (Ent) loop + Qualify_Entity_Name (Ent); + Next_Entity (Ent); + + -- There are odd cases where Last_Entity (E) = E. This happens + -- in the case of renaming of packages. This test avoids + -- getting stuck in such cases. + + exit when Ent = E; + end loop; + end if; end loop; end Qualify_All_Entity_Names; |