decl.c (gnat_to_gnu_entity): Skip regular processing for Itypes that are E_Access_Sub...

	* gcc-interface/decl.c (gnat_to_gnu_entity): Skip regular processing
	for Itypes that are E_Access_Subtype.
	<E_Access_Subtype>: Use the DECL of the base type directly.

From-SVN: r248323

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 945218bae91dedbb142e60f7ae067f2ca6b03484..702ac99cd874c8f96aa8154b2409bcce1a806084 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (gnat_to_gnu_entity): Skip regular processing
+       for Itypes that are E_Access_Subtype.
+       <E_Access_Subtype>: Use the DECL of the base type directly.
+
 2017-05-22  Ed Schonberg  <schonberg@adacore.com>
             Eric Botcazou  <ebotcazou@adacore.com>
 

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 91a03cd631bfbbd1edd565c089d047eac2871af0..eab244e910c176c888f3642c94583ddea215e798 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -310,11 +310,13 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
   /* Contains the list of attributes directly attached to the entity.  */
   struct attrib *attr_list = NULL;
 
-  /* Since a use of an Itype is a definition, process it as such if it
-     is not in a with'ed unit.  */
+  /* Since a use of an Itype is a definition, process it as such if it is in
+     the main unit, except for E_Access_Subtype because it's actually a use
+     of its base type, see below.  */
   if (!definition
       && is_type
       && Is_Itype (gnat_entity)
+      && Ekind (gnat_entity) != E_Access_Subtype
       && !present_gnu_tree (gnat_entity)
       && In_Extended_Main_Code_Unit (gnat_entity))
     {
@@ -3823,7 +3825,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
     case E_Access_Subtype:
       /* We treat this as identical to its base type; any constraint is
         meaningful only to the front-end.  */
-      gnu_type = gnat_to_gnu_type (Etype (gnat_entity));
+      gnu_decl = gnat_to_gnu_entity (Etype (gnat_entity), NULL_TREE, false);
+      saved = true;
 
       /* The designated subtype must be elaborated as well, if it does
         not have its own freeze node.  But designated subtypes created
@@ -3855,8 +3858,6 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
            gnat_to_gnu_entity (Directly_Designated_Type (gnat_entity),
                                NULL_TREE, false);
        }
-
-      maybe_present = true;
       break;
 
     /* Subprogram Entities

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b058621f0e4850a849ac7584c977e6dd22e2b472..b23bdeb81b3c7705a36b216d281a487150635eb0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-22  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+       * gnat.dg/specs/not_null1.ads: New test.
+
 2017-05-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/limited_with5.ad[sb]: New test.

diff --git a/gcc/testsuite/gnat.dg/specs/not_null1.ads b/gcc/testsuite/gnat.dg/specs/not_null1.ads
new file mode 100644 (file)
index 0000000..ccf55e5
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/specs/not_null1.ads
@@ -0,0 +1,11 @@
+-- { dg-do compile }
+
+package Not_Null1 is
+   type T is null record;
+   type T_Access is access all T;
+
+   procedure Proc (This : in not null T_Access) is null;
+
+   type Proc_Access is access procedure (This : in not null T_Access);
+   PA : Proc_Access := Proc'Access;
+end Not_Null1;