[gcc r12-6228] [Ada] Renamed_Entity should return Entity_Id

[gcc r12-6228] [Ada] Renamed_Entity should return Entity_Id

[Pierre-Marie de Rodat]

https://gcc.gnu.org/g:0f93c574cb78938c7e43b8dc8705ca072f436ab9

commit r12-6228-g0f93c574cb78938c7e43b8dc8705ca072f436ab9
Author: Bob Duff <duff@adacore.com>
Date:   Mon Nov 29 07:45:00 2021 -0500

    [Ada] Renamed_Entity should return Entity_Id
    
    gcc/ada/
    
            * einfo-utils.ads, einfo-utils.adb (Renamed_Entity Alias):
            Change Node_Id to Entity_Id.

Diff:
---
 gcc/ada/einfo-utils.adb | 12 ++++++------
 gcc/ada/einfo-utils.ads |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb
index 763b6462428..49273ba795e 100644
--- a/gcc/ada/einfo-utils.adb
+++ b/gcc/ada/einfo-utils.adb
@@ -47,16 +47,16 @@ package body Einfo.Utils is
    -- Aliases/Renamings of Renamed_Or_Alias --
    -------------------------------------------
 
-   function Alias (N : Entity_Id) return Node_Id is
+   function Alias (N : Entity_Id) return Entity_Id is
    begin
-      return Val : constant Node_Id := Renamed_Or_Alias (N) do
+      return Val : constant Entity_Id := Renamed_Or_Alias (N) do
          pragma Assert
            (Is_Overloadable (N) or else Ekind (N) = E_Subprogram_Type);
          pragma Assert (Val in N_Entity_Id | N_Empty_Id);
       end return;
    end Alias;
 
-   procedure Set_Alias (N : Entity_Id; Val : Node_Id) is
+   procedure Set_Alias (N : Entity_Id; Val : Entity_Id) is
    begin
       pragma Assert
         (Is_Overloadable (N) or else Ekind (N) = E_Subprogram_Type);
@@ -65,15 +65,15 @@ package body Einfo.Utils is
       Set_Renamed_Or_Alias (N, Val);
    end Set_Alias;
 
-   function Renamed_Entity (N : Entity_Id) return Node_Id is
+   function Renamed_Entity (N : Entity_Id) return Entity_Id is
    begin
-      return Val : constant Node_Id := Renamed_Or_Alias (N) do
+      return Val : constant Entity_Id := Renamed_Or_Alias (N) do
          pragma Assert (not Is_Object (N) or else Etype (N) = Any_Type);
          pragma Assert (Val in N_Entity_Id | N_Empty_Id);
       end return;
    end Renamed_Entity;
 
-   procedure Set_Renamed_Entity (N : Entity_Id; Val : Node_Id) is
+   procedure Set_Renamed_Entity (N : Entity_Id; Val : Entity_Id) is
    begin
       pragma Assert (not Is_Object (N));
       pragma Assert (Val in N_Entity_Id);
diff --git a/gcc/ada/einfo-utils.ads b/gcc/ada/einfo-utils.ads
index c82b469d430..68728be1781 100644
--- a/gcc/ada/einfo-utils.ads
+++ b/gcc/ada/einfo-utils.ads
@@ -42,10 +42,10 @@ package Einfo.Utils is
    --  expressions, but those use different mechanisms; the fields here are not
    --  used.
 
-   function Alias (N : Entity_Id) return Node_Id;
-   procedure Set_Alias (N : Entity_Id; Val : Node_Id);
-   function Renamed_Entity (N : Entity_Id) return Node_Id;
-   procedure Set_Renamed_Entity (N : Entity_Id; Val : Node_Id);
+   function Alias (N : Entity_Id) return Entity_Id;
+   procedure Set_Alias (N : Entity_Id; Val : Entity_Id);
+   function Renamed_Entity (N : Entity_Id) return Entity_Id;
+   procedure Set_Renamed_Entity (N : Entity_Id; Val : Entity_Id);
    function Renamed_Object (N : Entity_Id) return Node_Id;
    procedure Set_Renamed_Object (N : Entity_Id; Val : Node_Id);