[Ada] Reuse Is_Object where possible

2020-06-16  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* einfo.adb, exp_spark.adb, exp_util.adb, sem_eval.adb: Replace
	"Ekind ... in Object_Kind" with "Is_Object (...)".

diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb
index 4b664316ace33644efde0ae3dec2be2dd60d3e51..cf3ba2049c3ccf1f95661e3b6aa942db3e445555 100644 (file)
--- a/gcc/ada/einfo.adb
+++ b/gcc/ada/einfo.adb
@@ -997,7 +997,7 @@ package body Einfo is
 
    function Current_Value (Id : E) return N is
    begin
-      pragma Assert (Ekind (Id) in Object_Kind);
+      pragma Assert (Is_Object (Id));
       return Node9 (Id);
    end Current_Value;
 

diff --git a/gcc/ada/exp_spark.adb b/gcc/ada/exp_spark.adb
index b8b303c1f3a44a32f90e72d4bb914c212fff61da..207bb06d4acd67aecd253d2c40bb989b7e05e266 100644 (file)
--- a/gcc/ada/exp_spark.adb
+++ b/gcc/ada/exp_spark.adb
@@ -434,7 +434,7 @@ package body Exp_SPARK is
    begin
       --  Replace a reference to a renaming with the actual renamed object
 
-      if Ekind (Obj_Id) in Object_Kind then
+      if Is_Object (Obj_Id) then
          Ren := Renamed_Object (Obj_Id);
 
          if Present (Ren) then

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index d48db565b075e057811e3d3a9100d79e86350f39..537f0fc2490b4809d52c320d21707b8af0834028 100644 (file)
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -6396,7 +6396,7 @@ package body Exp_Util is
 
       --  Immediate return, nothing doing, if this is not an object
 
-      if Ekind (Ent) not in Object_Kind then
+      if not Is_Object (Ent) then
          return;
       end if;
 

diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
index 74eebb80e58d0921df9fb4eef0b8c2de455afc2a..077e59d099fb42dacdeb863cf8569422416b3597 100644 (file)
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -1001,7 +1001,7 @@ package body Sem_Eval is
                     (Is_Known_Valid (Entity (Opnd))
                       or else Ekind (Entity (Opnd)) = E_In_Parameter
                       or else
-                        (Ekind (Entity (Opnd)) in Object_Kind
+                        (Is_Object (Entity (Opnd))
                           and then Present (Current_Value (Entity (Opnd))))))
            or else Is_OK_Static_Expression (Opnd);
       end Is_Known_Valid_Operand;