diff options
| author | Bob Duff <duff@adacore.com> | 2022-04-28 10:22:42 -0400 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-06-01 08:43:15 +0000 |
| commit | 5512eabc3e162c2c1e4c54febc716353519e51f0 (patch) | |
| tree | 2a3d16b45828288ea5d103979c0a277c48a4baa8 /gcc | |
| parent | 3cd52053f80846df2ea22e3fff059ebc094e649b (diff) | |
| download | gcc-5512eabc3e162c2c1e4c54febc716353519e51f0.zip gcc-5512eabc3e162c2c1e4c54febc716353519e51f0.tar.gz gcc-5512eabc3e162c2c1e4c54febc716353519e51f0.tar.bz2 | |
[Ada] Incorrect code for anonymous access-to-function with convention C
This patch fixes a bug where the compiler generates incorrect code for a
call via an object with convention C, whose type is an anonymous
access-to-function type.
gcc/ada/
* einfo-utils.adb (Set_Convention): Call Set_Convention
recursively, so that Set_Can_Use_Internal_Rep is called (if
appropriate) on the anonymous access type of the object, and its
designated subprogram type.
* sem_ch3.adb (Access_Definition): Remove redundant call to
Set_Can_Use_Internal_Rep.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/einfo-utils.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/sem_ch3.adb | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb index 48a1bce..5e778b1 100644 --- a/gcc/ada/einfo-utils.adb +++ b/gcc/ada/einfo-utils.adb @@ -2659,7 +2659,7 @@ package body Einfo.Utils is | E_Anonymous_Access_Subprogram_Type and then not Has_Convention_Pragma (Typ) then - Set_Basic_Convention (Typ, Val); + Set_Convention (Typ, Val); Set_Has_Convention_Pragma (Typ); -- And for the access subprogram type, deal similarly with the @@ -2669,10 +2669,9 @@ package body Einfo.Utils is declare Dtype : constant Entity_Id := Designated_Type (Typ); begin - if Ekind (Dtype) = E_Subprogram_Type - and then not Has_Convention_Pragma (Dtype) - then - Set_Basic_Convention (Dtype, Val); + if Ekind (Dtype) = E_Subprogram_Type then + pragma Assert (not Has_Convention_Pragma (Dtype)); + Set_Convention (Dtype, Val); Set_Has_Convention_Pragma (Dtype); end if; end; diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 34dac1d..b7f26a3 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -876,9 +876,6 @@ package body Sem_Ch3 is Mutate_Ekind (Anon_Type, E_Anonymous_Access_Subprogram_Type); end if; - Set_Can_Use_Internal_Rep - (Anon_Type, not Always_Compatible_Rep_On_Target); - -- If the anonymous access is associated with a protected operation, -- create a reference to it after the enclosing protected definition -- because the itype will be used in the subsequent bodies. |