[Ada] Unnest all subprograms relevant for code generation

2018-05-21  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* exp_unst.adb (Unnest_Subprogram): Unnest all subprograms relevant for
	code generation.

From-SVN: r260446

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 765af4e438c273eeb3d6e920672cc5a2d387534d..f74cf3f2d7943f06245f5c3dacd37825b1f051f7 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-04  Arnaud Charlet  <charlet@adacore.com>
+
+       * exp_unst.adb (Unnest_Subprogram): Unnest all subprograms relevant for
+       code generation.
+
 2018-04-04  Piotr Trojanek  <trojanek@adacore.com>
 
        * lib.ads: Fix typo in enumeration in comment.

diff --git a/gcc/ada/exp_unst.adb b/gcc/ada/exp_unst.adb
index 6403bdb2def1d5f9a02c987b9d2382db654cef4d..c63d2281e20feac806281a80c8ee793dc96acdce 100644 (file)
--- a/gcc/ada/exp_unst.adb
+++ b/gcc/ada/exp_unst.adb
@@ -312,9 +312,9 @@ package body Exp_Unst is
          return;
       end if;
 
-      --  At least for now, do not unnest anything but main source unit
+      --  Only unnest when generating code for the main source unit
 
-      if not In_Extended_Main_Source_Unit (Subp_Body) then
+      if not In_Extended_Main_Code_Unit (Subp_Body) then
          return;
       end if;
 
@@ -1556,7 +1556,7 @@ package body Exp_Unst is
                --  from level STJR.Lev to level STJE.Lev. The general form of
                --  the rewritten reference for entity X is:
 
-               --    Typ'Deref (ARECaF.ARECbU.ARECcU.ARECdU....ARECm.X)
+               --    Typ'Deref (ARECaF.ARECbU.ARECcU.ARECdU....ARECmU.X)
 
                --  where a,b,c,d .. m =
                --    STJR.Lev - 1,  STJR.Lev - 2, .. STJE.Lev