[Ada] Replace low-level membership test with a high-level Is_Record_Type
authorPiotr Trojanek <trojanek@adacore.com>
Fri, 1 Jan 2021 12:23:35 +0000 (13:23 +0100)
committerPierre-Marie de Rodat <derodat@adacore.com>
Mon, 3 May 2021 09:28:28 +0000 (05:28 -0400)
gcc/ada/

* einfo.adb (Write_Entity_Info): Simplify an Ekind membership
test.
* exp_aggr.adb (Is_CCG_Supported_Aggregate): Likewise.

gcc/ada/einfo.adb
gcc/ada/exp_aggr.adb

index 9ea9373..2dd448c 100644 (file)
@@ -10192,7 +10192,7 @@ package body Einfo is
             Write_Eol;
 
          when E_Component =>
-            if Ekind (Scope (Id)) in Record_Kind then
+            if Is_Record_Type (Scope (Id)) then
                Write_Attribute (
                   "   Original_Record_Component   ",
                   Original_Record_Component (Id));
index 800d5f5..00ca1e8 100644 (file)
@@ -8623,7 +8623,7 @@ package body Exp_Aggr is
       --  Aggregates are not supported for nonstandard rep clauses, since they
       --  may lead to extra padding fields in CCG.
 
-      if Ekind (Etype (N)) in Record_Kind
+      if Is_Record_Type (Etype (N))
         and then Has_Non_Standard_Rep (Etype (N))
       then
          return False;