[multiple changes]

2017-01-13  Javier Miranda  <miranda@adacore.com>

	* einfo.ads (Component_Bit_Offset): Fix documentation.
	* sem_ch13.adb (Check_Record_Representation_Clause): Skip check
	on record holes for components with unknown compile-time offsets.

2017-01-13  Bob Duff  <duff@adacore.com>

	* ali.ads, ali.adb (Static_Elaboration_Model_Used): Remove unused flag.
	* g-locfil.ads: Minor comment fix.

2017-01-13  Bob Duff  <duff@adacore.com>

	* binde.adb (Elab_New): New elaboration order algorithm
	that is expected to cause fewer ABE issues. This is a work in
	progress. The new algorithm is currently disabled, and can be
	enable by the -dp switch, or by modifying the Do_Old and Do_New
	etc. flags and rebuilding. Experimental code is included to
	compare the results of the old and new algorithms.
	* binde.ads: Use GNAT.Dynamic_Tables instead of Table, so we
	can have multiple of these tables, so the old and new algorithms
	can coexist.
	* bindgen.ads (Gen_Output_File): Pass Elab_Order as an 'in'
	parameter of type array. This avoids the global variable, and
	allows bounds checking (which is normally defeated by the tables
	packages). It also ensures that the Elab_Order is read-only
	to Bindgen.
	* bindgen.adb: Pass Elab_Order as an 'in' parameter to all
	subprograms that need it, as above.
	* debug.adb: Document new -dp switch. Modify doc of old -do
	switch.
	* gnatbind.adb (Gnatbind): Make use of new interfaces to Binde
	and Bindgen.  Move writing of closure (-R and -Ra switches)
	to Binde; that's more convenient.

2017-01-13  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch6.adb (Analyze_Expression_Function): If the expression
	function is a completion, all entities referenced in the
	expression are frozen. As a consequence, a reference to an
	uncompleted private type from an enclosing scope is illegal.

From-SVN: r244419

1 files changed, 32 insertions, 154 deletions

diff --git a/gcc/ada/gnatbind.adb b/gcc/ada/gnatbind.adb
index 7d98751..ebe87c1 100644
--- a/gcc/ada/gnatbind.adb
+++ b/gcc/ada/gnatbind.adb
@@ -30,12 +30,10 @@ with Binde;    use Binde;
 with Binderr;  use Binderr;
 with Bindgen;  use Bindgen;
 with Bindusg;
-with Butil;    use Butil;
 with Casing;   use Casing;
 with Csets;
 with Debug;    use Debug;
 with Fmap;
-with Fname;    use Fname;
 with Namet;    use Namet;
 with Opt;      use Opt;
 with Osint;    use Osint;
@@ -45,7 +43,6 @@ with Rident;   use Rident;
 with Snames;
 with Switch;   use Switch;
 with Switch.B; use Switch.B;
-with Table;
 with Targparm; use Targparm;
 with Types;    use Types;
 
@@ -76,22 +73,15 @@ procedure Gnatbind is
 
    Mapping_File : String_Ptr := null;
 
-   package Closure_Sources is new Table.Table
-     (Table_Component_Type => File_Name_Type,
-      Table_Index_Type     => Natural,
-      Table_Low_Bound      => 1,
-      Table_Initial        => 10,
-      Table_Increment      => 100,
-      Table_Name           => "Gnatbind.Closure_Sources");
-   --  Table to record the sources in the closure, to avoid duplications. Used
-   --  only with switch -R.
-
    procedure Add_Artificial_ALI_File (Name : String);
    --  Artificially add ALI file Name in the closure
 
    function Gnatbind_Supports_Auto_Init return Boolean;
-   --  Indicates if automatic initialization of elaboration procedure
-   --  through the constructor mechanism is possible on the platform.
+   --  Indicates if automatic initialization of elaboration procedure through
+   --  the constructor mechanism is possible on the platform.
+
+   function Is_Cross_Compiler return Boolean;
+   --  Returns True iff this is a cross-compiler
 
    procedure List_Applicable_Restrictions;
    --  List restrictions that apply to this partition if option taken
@@ -110,9 +100,6 @@ procedure Gnatbind is
    procedure Write_Arg (S : String);
    --  Passed to Generic_Scan_Bind_Args to print args
 
-   function Is_Cross_Compiler return Boolean;
-   --  Returns True iff this is a cross-compiler
-
    -----------------------------
    -- Add_Artificial_ALI_File --
    -----------------------------
@@ -149,6 +136,7 @@ procedure Gnatbind is
       function gnat_binder_supports_auto_init return Integer;
       pragma Import (C, gnat_binder_supports_auto_init,
                      "__gnat_binder_supports_auto_init");
+
    begin
       return gnat_binder_supports_auto_init /= 0;
    end Gnatbind_Supports_Auto_Init;
@@ -160,6 +148,7 @@ procedure Gnatbind is
    function Is_Cross_Compiler return Boolean is
       Cross_Compiler : Integer;
       pragma Import (C, Cross_Compiler, "__gnat_is_cross_compiler");
+
    begin
       return Cross_Compiler = 1;
    end Is_Cross_Compiler;
@@ -287,13 +276,13 @@ procedure Gnatbind is
 
       for R in All_Restrictions loop
          if not No_Restriction_List (R)
-            and then Restriction_Could_Be_Set (R)
+           and then Restriction_Could_Be_Set (R)
          then
             if not Additional_Restrictions_Listed then
                Write_Eol;
                Write_Line
-                 ("The following additional restrictions may be" &
-                  " applied to this partition:");
+                 ("The following additional restrictions may be applied to "
+                  & "this partition:");
                Additional_Restrictions_Listed := True;
             end if;
 
@@ -301,6 +290,7 @@ procedure Gnatbind is
 
             declare
                S : constant String := Restriction_Id'Image (R);
+
             begin
                Name_Len := S'Length;
                Name_Buffer (1 .. Name_Len) := S;
@@ -377,8 +367,8 @@ procedure Gnatbind is
 
             else
                Fail
-                 ("Prefix of initialization and finalization " &
-                  "procedure names missing in -L");
+                 ("Prefix of initialization and finalization procedure names "
+                  & "missing in -L");
             end if;
 
          --  -Sin -Slo -Shi -Sxx -Sev
@@ -560,12 +550,12 @@ procedure Gnatbind is
       Write_Str (" " & S);
    end Write_Arg;
 
-   procedure Scan_Bind_Args is new Generic_Scan_Bind_Args (Scan_Bind_Arg);
-   procedure Put_Bind_Args is new Generic_Scan_Bind_Args (Write_Arg);
-
    procedure Check_Version_And_Help is
      new Check_Version_And_Help_G (Bindusg.Display);
 
+   procedure Put_Bind_Args  is new Generic_Scan_Bind_Args (Write_Arg);
+   procedure Scan_Bind_Args is new Generic_Scan_Bind_Args (Scan_Bind_Arg);
+
 --  Start of processing for Gnatbind
 
 begin
@@ -582,8 +572,8 @@ begin
    begin
       pragma Assert
         (Shared_Libgnat_Default = SHARED
-         or else
-        Shared_Libgnat_Default = STATIC);
+          or else
+         Shared_Libgnat_Default = STATIC);
       Shared_Libgnat := (Shared_Libgnat_Default = SHARED);
    end;
 
@@ -618,8 +608,8 @@ begin
          Fail ("switch -a must be used in conjunction with -n or -Lxxx");
 
       elsif not Gnatbind_Supports_Auto_Init then
-         Fail ("automatic initialisation of elaboration " &
-               "not supported on this platform");
+         Fail ("automatic initialisation of elaboration not supported on this "
+               & "platform");
       end if;
    end if;
 
@@ -641,6 +631,7 @@ begin
       Check_Extensions : declare
          Length : constant Natural := Output_File_Name'Length;
          Last   : constant Natural := Output_File_Name'Last;
+
       begin
          if Length <= 4
            or else Output_File_Name (Last - 3 .. Last) /= ".adb"
@@ -873,132 +864,19 @@ begin
       --  Complete bind if no errors
 
       if Errors_Detected = 0 then
-         Find_Elab_Order;
-
-         if Errors_Detected = 0 then
-            --  Display elaboration order if -l was specified
-
-            if Elab_Order_Output then
-               if not Zero_Formatting then
-                  Write_Eol;
-                  Write_Str ("ELABORATION ORDER");
-                  Write_Eol;
-               end if;
-
-               for J in Elab_Order.First .. Elab_Order.Last loop
-                  if not Units.Table (Elab_Order.Table (J)).SAL_Interface then
-                     if not Zero_Formatting then
-                        Write_Str ("   ");
-                     end if;
-
-                     Write_Unit_Name
-                       (Units.Table (Elab_Order.Table (J)).Uname);
-                     Write_Eol;
-                  end if;
-               end loop;
-
-               if not Zero_Formatting then
-                  Write_Eol;
-               end if;
-            end if;
-
-            if not Check_Only then
-               Gen_Output_File (Output_File_Name.all);
-            end if;
+         declare
+            Elab_Order : Unit_Id_Table;
+            use Unit_Id_Tables;
 
-            --  Display list of sources in the closure (except predefined
-            --  sources) if -R was used.
-
-            if List_Closure then
-               List_Closure_Display : declare
-                  Source : File_Name_Type;
-
-                  function Put_In_Sources (S : File_Name_Type) return Boolean;
-                  --  Check if S is already in table Sources and put in Sources
-                  --  if it is not. Return False if the source is already in
-                  --  Sources, and True if it is added.
-
-                  --------------------
-                  -- Put_In_Sources --
-                  --------------------
-
-                  function Put_In_Sources
-                    (S : File_Name_Type) return Boolean
-                  is
-                  begin
-                     for J in 1 .. Closure_Sources.Last loop
-                        if Closure_Sources.Table (J) = S then
-                           return False;
-                        end if;
-                     end loop;
-
-                     Closure_Sources.Append (S);
-                     return True;
-                  end Put_In_Sources;
-
-               --  Start of processing for List_Closure_Display
-
-               begin
-                  Closure_Sources.Init;
-
-                  if not Zero_Formatting then
-                     Write_Eol;
-                     Write_Str ("REFERENCED SOURCES");
-                     Write_Eol;
-                  end if;
+         begin
+            Find_Elab_Order (Elab_Order, First_Main_Lib_File);
 
-                  for J in reverse Elab_Order.First .. Elab_Order.Last loop
-                     Source := Units.Table (Elab_Order.Table (J)).Sfile;
-
-                     --  Do not include same source more than once
-
-                     if Put_In_Sources (Source)
-
-                       --  Do not include run-time units unless -Ra switch set
-
-                       and then (List_Closure_All
-                                  or else not Is_Internal_File_Name (Source))
-                     then
-                        if not Zero_Formatting then
-                           Write_Str ("   ");
-                        end if;
-
-                        Write_Str (Get_Name_String (Source));
-                        Write_Eol;
-                     end if;
-                  end loop;
-
-                  --  Subunits do not appear in the elaboration table because
-                  --  they are subsumed by their parent units, but we need to
-                  --  list them for other tools. For now they are listed after
-                  --  other files, rather than right after their parent, since
-                  --  there is no easy link between the elaboration table and
-                  --  the ALIs table ??? As subunits may appear repeatedly in
-                  --  the list, if the parent unit appears in the context of
-                  --  several units in the closure, duplicates are suppressed.
-
-                  for J in Sdep.First .. Sdep.Last loop
-                     Source := Sdep.Table (J).Sfile;
-
-                     if Sdep.Table (J).Subunit_Name /= No_Name
-                       and then Put_In_Sources (Source)
-                       and then not Is_Internal_File_Name (Source)
-                     then
-                        if not Zero_Formatting then
-                           Write_Str ("   ");
-                        end if;
-
-                        Write_Str (Get_Name_String (Source));
-                        Write_Eol;
-                     end if;
-                  end loop;
-
-                  if not Zero_Formatting then
-                     Write_Eol;
-                  end if;
-               end List_Closure_Display;
+            if Errors_Detected = 0 and then not Check_Only then
+               Gen_Output_File
+                 (Output_File_Name.all,
+                  Elab_Order => Elab_Order.Table (First .. Last (Elab_Order)));
             end if;
-         end if;
+         end;
       end if;
 
       Total_Errors := Total_Errors + Errors_Detected;
@@ -1010,7 +888,7 @@ begin
          Total_Warnings := Total_Warnings + Warnings_Detected;
    end;
 
-   --  All done. Set proper exit status
+   --  All done. Set the proper exit status.
 
    Finalize_Binderr;
    Namet.Finalize;