[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.

diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb
index 48a1bce817de45b4c4eec6a84efc404d91c58299..5e778b127f6d0212da93bda9ebcee16b187fcdc7 100644 (file)
--- 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 34dac1df6246c2a6f66a83c439b61c0c1d7a6344..b7f26a3a066f09329b834b954db81f2dd2aace1d 100644 (file)
--- 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.