OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Use Is_Generic_Subprogram where possible

Browse Source 
gcc/ada/

	* einfo.adb, sem_ch10.adb, sem_ch12.adb, sem_ch8.adb: Use
	Is_Generic_Subprogram.
This commit is contained in:
Piotr Trojanek 2020-05-14 21:56:29 +02:00 committed by Pierre-Marie de Rodat
parent e082411903
commit eada422063
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ada/einfo.adb
View File

@ -2577,9 +2577,7 @@ package body Einfo is
function Is_Primitive (Id : E) return B is
begin
pragma Assert
(Is_Overloadable (Id)
or else Ekind_In (Id, E_Generic_Function, E_Generic_Procedure));
pragma Assert (Is_Overloadable (Id) or else Is_Generic_Subprogram (Id));
return Flag218 (Id);
end Is_Primitive;
@ -5822,9 +5820,7 @@ package body Einfo is
procedure Set_Is_Primitive (Id : E; V : B := True) is
begin
pragma Assert
(Is_Overloadable (Id)
or else Ekind_In (Id, E_Generic_Function, E_Generic_Procedure));
pragma Assert (Is_Overloadable (Id) or else Is_Generic_Subprogram (Id));
Set_Flag218 (Id, V);
end Set_Is_Primitive;

2
gcc/ada/sem_ch10.adb
View File

@ -6313,7 +6313,7 @@ package body Sem_Ch10 is
if Is_Subprogram (E) and then Has_Pragma_Inline (E) then
return True;
elsif Ekind_In (E, E_Generic_Function, E_Generic_Procedure) then
elsif Is_Generic_Subprogram (E) then
-- A generic subprogram always requires the presence of its
-- body because an instantiation needs both templates. The only

3
gcc/ada/sem_ch12.adb
View File

@ -5664,8 +5664,7 @@ package body Sem_Ch12 is
-- If renaming, get original unit
if Present (Renamed_Object (Gen_Unit))
and then Ekind_In (Renamed_Object (Gen_Unit), E_Generic_Procedure,
E_Generic_Function)
and then Is_Generic_Subprogram (Renamed_Object (Gen_Unit))
then
Gen_Unit := Renamed_Object (Gen_Unit);
Set_Is_Instantiated (Gen_Unit);

2
gcc/ada/sem_ch8.adb
View File

@ -729,7 +729,7 @@ package body Sem_Ch8 is
-- For subprograms, propagate the Intrinsic flag, to allow, e.g.
-- renamings and subsequent instantiations of Unchecked_Conversion.
if Ekind_In (Old_P, E_Generic_Function, E_Generic_Procedure) then
if Is_Generic_Subprogram (Old_P) then
Set_Is_Intrinsic_Subprogram
(New_P, Is_Intrinsic_Subprogram (Old_P));
end if;