4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc
index 95fa508..9c7f684 100644
--- a/gcc/ada/gcc-interface/decl.cc
+++ b/gcc/ada/gcc-interface/decl.cc
@@ -6329,6 +6329,12 @@ gnat_to_gnu_subprog_type (Entity_Id gnat_subprog, bool definition,
 
 	  if (debug_info_p)
 	    rest_of_record_type_compilation (gnu_cico_return_type);
+
+	  /* Declare it now since it will never be declared otherwise.  This
+	     is necessary to ensure that its subtrees are properly marked.  */
+	  create_type_decl (TYPE_NAME (gnu_cico_return_type),
+			    gnu_cico_return_type,
+			    true, debug_info_p, gnat_subprog);
 	}
 
       gnu_return_type = gnu_cico_return_type;
diff --git a/gcc/testsuite/gnat.dg/varsize4.adb b/gcc/testsuite/gnat.dg/varsize4.adb
new file mode 100644
index 0000000..3d0430d
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/varsize4.adb
@@ -0,0 +1,19 @@
+-- { dg-do compile }
+
+package body Varsize4 is
+
+   function Func (bytes_read : out Natural) return Arr is
+      Ret : Arr := (others => False);
+   begin
+      return Ret;
+   end;
+
+   function Get return Natural is
+      Data  : Arr;
+      Bytes : Natural;
+   begin
+      Data := Func (Bytes);
+      return Bytes;
+   end;
+
+end Varsize4;
diff --git a/gcc/testsuite/gnat.dg/varsize4.ads b/gcc/testsuite/gnat.dg/varsize4.ads
new file mode 100644
index 0000000..62b673f
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/varsize4.ads
@@ -0,0 +1,9 @@
+with Varsize4_Pkg;
+
+package Varsize4 is
+
+   type Arr is array (1 .. Varsize4_Pkg.F) of Boolean;
+
+   function Get return Natural;
+
+end Varsize4;
diff --git a/gcc/testsuite/gnat.dg/varsize4_pkg.ads b/gcc/testsuite/gnat.dg/varsize4_pkg.ads
new file mode 100644
index 0000000..e07a6b0
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/varsize4_pkg.ads
@@ -0,0 +1,5 @@
+package Varsize4_Pkg is
+
+   function F return Natural;
+
+end Varsize4_Pkg;