Commit ba301a3b by Eric Botcazou Committed by Pierre-Marie de Rodat

[Ada] Fix assertion failures with -gnatde and -gnatdv

This fixes a couple of assertion failures when using -gnatde and -gnatdv
on a compiler built with assertions enabled.  No functional changes.

2018-12-03  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* einfo.adb (Write_Entity_Info): Don't take Scope of Standard
	package.
	* sem_ch4.adb (Remove_Abstract_Operations): Add missing blank
	lines to -gnatdv output.
	* sem_type.adb (Write_Overloads): Take Entity of entity names
	only.

From-SVN: r266751
parent 89beb653
2018-12-03 Eric Botcazou <ebotcazou@adacore.com>
* einfo.adb (Write_Entity_Info): Don't take Scope of Standard
package.
* sem_ch4.adb (Remove_Abstract_Operations): Add missing blank
lines to -gnatdv output.
* sem_type.adb (Write_Overloads): Take Entity of entity names
only.
2018-12-03 Hristian Kirtchev <kirtchev@adacore.com>
* checks.adb, exp_aggr.adb, exp_attr.adb, exp_ch3.adb,
......
......@@ -10032,7 +10032,9 @@ package body Einfo is
Write_Eol;
Write_Attribute (" Type ", Etype (Id));
Write_Eol;
Write_Attribute (" Scope ", Scope (Id));
if Id /= Standard_Standard then
Write_Attribute (" Scope ", Scope (Id));
end if;
Write_Eol;
case Ekind (Id) is
......
......@@ -7509,7 +7509,7 @@ package body Sem_Ch4 is
begin
if Is_Overloaded (N) then
if Debug_Flag_V then
Write_Str ("Remove_Abstract_Operations: ");
Write_Line ("Remove_Abstract_Operations: ");
Write_Overloads (N);
end if;
......@@ -7704,7 +7704,7 @@ package body Sem_Ch4 is
end if;
if Debug_Flag_V then
Write_Str ("Remove_Abstract_Operations done: ");
Write_Line ("Remove_Abstract_Operations done: ");
Write_Overloads (N);
end if;
end if;
......
......@@ -3608,8 +3608,10 @@ package body Sem_Type is
Print_Node_Briefly (N);
if not Is_Overloaded (N) then
Write_Line ("Non-overloaded entity ");
Write_Entity_Info (Entity (N), " ");
if Is_Entity_Name (N) then
Write_Line ("Non-overloaded entity ");
Write_Entity_Info (Entity (N), " ");
end if;
elsif Nkind (N) not in N_Has_Entity then
Get_First_Interp (N, I, It);
......
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