This removes a block of code in Resolve_Call that inserts an explicit
dereference for a call whose prefix is an access-to-subprogram type, but
this processing is already done earlier in Analyze_Call.
No functional changes.
Tested on x86_64-pc-linux-gnu, committed on trunk
2020-06-10 Eric Botcazou <ebotca...@adacore.com>
gcc/ada/
* sem_ch4.adb (Analyze_Call): Use idiomatic condition.
* sem_res.adb (Resolve_Call): Remove obsolete code.--- gcc/ada/sem_ch4.adb
+++ gcc/ada/sem_ch4.adb
@@ -1176,8 +1176,7 @@ package body Sem_Ch4 is
-- type is an array, F (X) cannot be interpreted as an indirect call
-- through the result of the call to F.
- elsif Is_Access_Type (Etype (Nam))
- and then Ekind (Designated_Type (Etype (Nam))) = E_Subprogram_Type
+ elsif Is_Access_Subprogram_Type (Base_Type (Etype (Nam)))
and then
(not Name_Denotes_Function
or else Nkind (N) = N_Procedure_Call_Statement
--- gcc/ada/sem_res.adb
+++ gcc/ada/sem_res.adb
@@ -6141,26 +6141,6 @@ package body Sem_Res is
end loop;
end if;
- if Is_Access_Subprogram_Type (Base_Type (Etype (Nam)))
- and then not Is_Access_Subprogram_Type (Base_Type (Typ))
- and then Nkind (Subp) /= N_Explicit_Dereference
- and then Present (Parameter_Associations (N))
- then
- -- The prefix is a parameterless function call that returns an access
- -- to subprogram. If parameters are present in the current call, add
- -- add an explicit dereference. We use the base type here because
- -- within an instance these may be subtypes.
-
- -- The dereference is added either in Analyze_Call or here. Should
- -- be consolidated ???
-
- Set_Is_Overloaded (Subp, False);
- Set_Etype (Subp, Etype (Nam));
- Insert_Explicit_Dereference (Subp);
- Nam := Designated_Type (Etype (Nam));
- Resolve (Subp, Nam);
- end if;
-
-- Check that a call to Current_Task does not occur in an entry body
if Is_RTE (Nam, RE_Current_Task) then
