diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb index 39b26e0e9b64a1c80ea598cfb17e1831ca979f77..096509b49d560133d573ebb0590e6f365549f1b2 100644 --- a/gcc/ada/exp_ch5.adb +++ b/gcc/ada/exp_ch5.adb @@ -534,9 +534,14 @@ package body Exp_Ch5 is Loop_Required := True; -- Arrays with controlled components are expanded into a loop to force - -- calls to Adjust at the component level. + -- calls to Adjust at the component level, except for a function call + -- that requires no controlling actions (see Expand_Ctrl_Function_Call). elsif Has_Controlled_Component (L_Type) then + if Nkind (Rhs) = N_Function_Call and then No_Ctrl_Actions (N) then + return; + end if; + Loop_Required := True; -- If object is full access, we cannot tolerate a loop