41intnam.ads, [...]: Merge in ACT changes.

	* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,
	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]

From-SVN: r50451

1 files changed, 98 insertions, 17 deletions

diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb
index 9efa7ca..34770d1 100644
--- a/gcc/ada/sem_elab.adb
+++ b/gcc/ada/sem_elab.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.3 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1997-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1997-2002 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -179,7 +179,7 @@ package body Sem_Elab is
    --  Outer_Scope is the outer level scope for the original call.
    --  Inter_Unit_Only is set if the call is only to be checked in the
    --  case where it is to another unit (and skipped if within a unit).
-   --  Generate_Warnings is set to True to suppress warning messages
+   --  Generate_Warnings is set to False to suppress warning messages
    --  about missing pragma Elaborate_All's. These messages are not
    --  wanted for inner calls in the dynamic model.
 
@@ -279,6 +279,12 @@ package body Sem_Elab is
    --  Given two scopes E1 and E2, returns True if E1 is equal to E2, or
    --  is one of its contained scopes, False otherwise.
 
+   function Within_Elaborate_All (E : Entity_Id) return Boolean;
+   --  Before emitting a warning on a scope E for a missing elaborate_all,
+   --  check whether E may be in the context of a directly visible unit
+   --  U to which the pragma applies. This prevents spurious warnings when
+   --  the called entity is renamed within U.
+
    ------------------
    -- Check_A_Call --
    ------------------
@@ -521,7 +527,6 @@ package body Sem_Elab is
 
          if Unit_Caller /= No_Unit
            and then Unit_Callee /= Unit_Caller
-           and then Unit_Callee /= No_Unit
            and then not Dynamic_Elaboration_Checks
          then
             E_Scope := Spec_Entity (Cunit_Entity (Unit_Caller));
@@ -539,7 +544,7 @@ package body Sem_Elab is
                E_Scope := Scope (E_Scope);
             end loop;
 
-         --  For the case of not in an instance, or call within instance
+         --  For the case N is not an instance, or a call within instance
          --  We recompute E_Scope for the error message, since we
          --  do NOT want to go to the unit which has the ultimate
          --  declaration in the case of renaming and derivation and
@@ -573,6 +578,10 @@ package body Sem_Elab is
             end loop;
          end if;
 
+         if Within_Elaborate_All (E_Scope) then
+            return;
+         end if;
+
          if not Suppress_Elaboration_Warnings (Ent)
            and then not Suppress_Elaboration_Warnings (E_Scope)
            and then Elab_Warnings
@@ -586,6 +595,20 @@ package body Sem_Elab is
             else
                Error_Msg_NE
                  ("call to & may raise Program_Error?", N, Ent);
+
+               if Unit_Callee = No_Unit
+                 and then E_Scope = Current_Scope
+               then
+                  --  The missing pragma cannot be on the current unit, so
+                  --  place it on the compilation unit that contains the
+                  --  called entity, which is more likely to be right.
+
+                  E_Scope := Ent;
+
+                  while not Is_Compilation_Unit (E_Scope) loop
+                     E_Scope := Scope (E_Scope);
+                  end loop;
+               end if;
             end if;
 
             Error_Msg_Qual_Level := Nat'Last;
@@ -663,9 +686,9 @@ package body Sem_Elab is
       if Nkind (N) not in N_Generic_Instantiation then
          return;
 
-      --  Nothing to do if errors already detected (avoid cascaded errors)
+      --  Nothing to do if serious errors detected (avoid cascaded errors)
 
-      elsif Errors_Detected /= 0 then
+      elsif Serious_Errors_Detected /= 0 then
          return;
 
       --  Nothing to do if not in full analysis mode
@@ -693,7 +716,7 @@ package body Sem_Elab is
       end if;
 
       Nam := Name (N);
-      Ent := Entity (Nam);
+      Ent := Get_Generic_Entity (N);
 
       --  The case we are interested in is when the generic spec is in the
       --  current declarative part
@@ -861,6 +884,7 @@ package body Sem_Elab is
 
             if Comes_From_Source (N)
               and then In_Preelaborated_Unit
+              and then not In_Inlined_Body
             then
                Error_Msg_N
                  ("non-static call not allowed in preelaborated unit", N);
@@ -1070,7 +1094,7 @@ package body Sem_Elab is
 
       --  Skip delayed calls if we had any errors
 
-      if Errors_Detected = 0 then
+      if Serious_Errors_Detected = 0 then
          Delaying_Elab_Checks := False;
          Expander_Mode_Save_And_Set (True);
 
@@ -1129,7 +1153,7 @@ package body Sem_Elab is
       end if;
 
       Nam := Name (N);
-      Ent := Entity (Nam);
+      Ent := Get_Generic_Entity (N);
       From_Elab_Code := not In_Subprogram_Or_Concurrent_Unit;
 
       --  See if we need to analyze this instantiation. We analyze it if
@@ -1214,7 +1238,7 @@ package body Sem_Elab is
 
       --  Nothing to do if errors already detected (avoid cascaded errors)
 
-      elsif Errors_Detected /= 0 then
+      elsif Serious_Errors_Detected /= 0 then
          return;
 
       --  Nothing to do if not in full analysis mode
@@ -1584,6 +1608,13 @@ package body Sem_Elab is
          --  will have been elaborated already. We keep separate lists for
          --  each kind of task.
 
+         --  Skip this test if errors have occurred, since in this case
+         --  we can get false indications.
+
+         if Total_Errors_Detected /= 0 then
+            return;
+         end if;
+
          if Present (Proc) then
             if Outer_Unit (Scope (Proc)) = Enclosing then
 
@@ -1768,7 +1799,7 @@ package body Sem_Elab is
    ----------------------
 
    function Has_Generic_Body (N : Node_Id) return Boolean is
-      Ent  : constant Entity_Id := Entity (Name (N));
+      Ent  : constant Entity_Id := Get_Generic_Entity (N);
       Decl : constant Node_Id   := Unit_Declaration_Node (Ent);
       Scop : Entity_Id;
 
@@ -2025,9 +2056,14 @@ package body Sem_Elab is
 
          begin
             if No (C) then
-               R :=  Make_Raise_Program_Error (Loc);
+               R :=
+                 Make_Raise_Program_Error (Loc,
+                   Reason => PE_Access_Before_Elaboration);
             else
-               R := Make_Raise_Program_Error (Loc, Make_Op_Not (Loc, C));
+               R :=
+                 Make_Raise_Program_Error (Loc,
+                   Condition => Make_Op_Not (Loc, C),
+                   Reason    => PE_Access_Before_Elaboration);
             end if;
 
             if No (Declarations (ADN)) then
@@ -2056,9 +2092,12 @@ package body Sem_Elab is
          then
             declare
                Typ : constant Entity_Id := Etype (N);
-               R   : constant Node_Id   := Make_Raise_Program_Error (Loc);
                Chk : constant Boolean   := Do_Range_Check (N);
 
+               R   : constant Node_Id :=
+                       Make_Raise_Program_Error (Loc,
+                         Reason => PE_Access_Before_Elaboration);
+
             begin
                Set_Etype (R, Typ);
 
@@ -2086,13 +2125,15 @@ package body Sem_Elab is
          else
             if No (C) then
                Insert_Action (Nod,
-                  Make_Raise_Program_Error (Loc));
+                  Make_Raise_Program_Error (Loc,
+                    Reason => PE_Access_Before_Elaboration));
             else
                Insert_Action (Nod,
                   Make_Raise_Program_Error (Loc,
                     Condition =>
                       Make_Op_Not (Loc,
-                        Right_Opnd => C)));
+                        Right_Opnd => C),
+                    Reason => PE_Access_Before_Elaboration));
             end if;
          end if;
       end if;
@@ -2284,4 +2325,44 @@ package body Sem_Elab is
       raise Program_Error;
    end Within;
 
+   --------------------------
+   -- Within_Elaborate_All --
+   --------------------------
+
+   function Within_Elaborate_All (E : Entity_Id) return Boolean is
+      Item    : Node_Id;
+      Item2   : Node_Id;
+      Elab_Id : Entity_Id;
+      Par     : Node_Id;
+
+   begin
+      Item := First (Context_Items (Cunit (Current_Sem_Unit)));
+
+      while Present (Item) loop
+         if Nkind (Item) = N_Pragma
+           and then Get_Pragma_Id (Chars (Item)) = Pragma_Elaborate_All
+         then
+            Elab_Id :=
+              Entity (
+                Expression (First (Pragma_Argument_Associations (Item))));
+            Par   := Parent (Unit_Declaration_Node (Elab_Id));
+            Item2 := First (Context_Items (Par));
+
+            while Present (Item2) loop
+               if Nkind (Item2) = N_With_Clause
+                 and then Entity (Name (Item2)) = E
+               then
+                  return True;
+               end if;
+
+               Next (Item2);
+            end loop;
+         end if;
+
+         Next (Item);
+      end loop;
+
+      return False;
+   end Within_Elaborate_All;
+
 end Sem_Elab;