c-ada-spec.c (get_underlying_decl): Do not look through typedefs.

	* c-ada-spec.c (get_underlying_decl): Do not look through typedefs.
	(dump_forward_type): Do not generate a declaration for function types.
	(dump_nested_type) <ARRAY_TYPE>: Do not generate a nested declaration
	of the component type if it is declared in another file.

From-SVN: r278129

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a174ff9047bc82262bb121b2fb294c0c7615024c..c7813a12d7db623279e7c0a6aea8f56ccdddad4d 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,10 @@
+2019-11-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * c-ada-spec.c (get_underlying_decl): Do not look through typedefs.
+       (dump_forward_type): Do not generate a declaration for function types.
+       (dump_nested_type) <ARRAY_TYPE>: Do not generate a nested declaration
+       of the component type if it is declared in another file.
+
 2019-11-12  Martin Liska  <mliska@suse.cz>
 
        * c-opts.c (c_common_post_options):

diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 38d65a64377872aa259fc6bac2f8d221ee236b36..5a142ce91be87bde9cc7ee79efe5f672ca37cacd 100644 (file)
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -1025,7 +1025,9 @@ get_underlying_decl (tree type)
 
   if (TYPE_P (type))
     {
-      type = TYPE_MAIN_VARIANT (type);
+      /* Strip qualifiers but do not look through typedefs.  */
+      if (TYPE_QUALS_NO_ADDR_SPACE (type))
+       type = TYPE_MAIN_VARIANT (type);
 
       /* type is a typedef.  */
       if (TYPE_NAME (type) && DECL_P (TYPE_NAME (type)))
@@ -2454,6 +2456,9 @@ dump_forward_type (pretty_printer *buffer, tree type, tree t, int spc)
   if (DECL_SOURCE_FILE (decl) != DECL_SOURCE_FILE (t))
     return;
 
+  if (TREE_CODE (type) == FUNCTION_TYPE)
+    return;
+
   /* Generate an incomplete type declaration.  */
   pp_string (buffer, "type ");
   dump_ada_node (buffer, decl, NULL_TREE, spc, false, true);
@@ -2522,7 +2527,10 @@ dump_nested_type (pretty_printer *buffer, tree field, tree t, tree parent,
       while (TREE_CODE (tmp) == ARRAY_TYPE)
        tmp = TREE_TYPE (tmp);
       decl = get_underlying_decl (tmp);
-      if (decl && !DECL_NAME (decl) && !TREE_VISITED (decl))
+      if (decl
+         && !DECL_NAME (decl)
+         && DECL_SOURCE_FILE (decl) == DECL_SOURCE_FILE (t)
+         && !TREE_VISITED (decl))
        {
          /* Generate full declaration.  */
          dump_nested_type (buffer, decl, t, parent, spc);