* 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]


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 54 insertions, 50 deletions

diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 7acc5512447..905cb41acc8 100644
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.2 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1992-2001, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-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- --
@@ -99,10 +99,6 @@ package body Exp_Ch9 is
    --  of the System.Address pointer passed to entry barrier functions
    --  and entry body procedures.
 
-   function Array_Type (E : Entity_Id; Trec : Node_Id) return Entity_Id;
-   --  Find the array type associated with an entry family in the
-   --  associated record for the task type.
-
    function Build_Accept_Body (Astat : Node_Id) return  Node_Id;
    --  Transform accept statement into a block with added exception handler.
    --  Used both for simple accept statements and for accept alternatives in
@@ -592,31 +588,6 @@ package body Exp_Ch9 is
 
    end Add_Private_Declarations;
 
-   ----------------
-   -- Array_Type --
-   ----------------
-
-   function Array_Type (E : Entity_Id; Trec : Node_Id) return Entity_Id is
-      Arr : Entity_Id := First_Component (Trec);
-
-   begin
-      while Present (Arr) loop
-         exit when Ekind (Arr) = E_Component
-           and then Is_Array_Type (Etype (Arr))
-           and then Chars (Arr) = Chars (E);
-
-         Next_Component (Arr);
-      end loop;
-
-      --  This used to return Arr itself, but this caused problems
-      --  when used in expanding a protected type, possibly because
-      --  the record of which it is a component is not frozen yet.
-      --  I am going to try the type instead. This may pose visibility
-      --  problems. ???
-
-      return Etype (Arr);
-   end Array_Type;
-
    -----------------------
    -- Build_Accept_Body --
    -----------------------
@@ -3283,7 +3254,7 @@ package body Exp_Ch9 is
          Update_Prival_Subtypes (B_F);
 
          Set_Privals (Spec_Decl, N, Loc);
-         Set_Discriminals (Spec_Decl, N, Loc);
+         Set_Discriminals (Spec_Decl);
          Set_Scope (Func, Scope (Prot));
       else
          Analyze (Cond);
@@ -4408,7 +4379,7 @@ package body Exp_Ch9 is
 
       if Present (Next_Op) then
          Set_Privals (Dec, Next_Op, Loc);
-         Set_Discriminals (Dec, Next_Op, Loc);
+         Set_Discriminals (Dec);
       end if;
 
    end Expand_N_Entry_Body;
@@ -5793,7 +5764,8 @@ package body Exp_Ch9 is
              Condition => Make_Op_Eq (Loc,
                Left_Opnd  => New_Reference_To (Xnam, Loc),
                Right_Opnd =>
-                 New_Reference_To (RTE (RE_No_Rendezvous), Loc))));
+                 New_Reference_To (RTE (RE_No_Rendezvous), Loc)),
+             Reason => PE_All_Guards_Closed));
 
          return Stats;
       end Accept_Or_Raise;
@@ -6756,6 +6728,17 @@ package body Exp_Ch9 is
       New_N : Node_Id;
 
    begin
+      --  Do not attempt expansion if in no run time mode
+
+      if No_Run_Time
+        and then not Restricted_Profile
+      then
+         Disallow_In_No_Run_Time_Mode (N);
+         return;
+      end if;
+
+      --  Here we start the expansion by generating discriminal declarations
+
       Add_Discriminal_Declarations (Declarations (N), Ttyp, Name_uTask, Loc);
 
       --  Add a call to Abort_Undefer at the very beginning of the task
@@ -6922,27 +6905,37 @@ package body Exp_Ch9 is
       Tasktyp   : constant Entity_Id  := Etype (Defining_Identifier (N));
       Tasknm    : constant Name_Id    := Chars (Tasktyp);
       Taskdef   : constant Node_Id    := Task_Definition (N);
-      Proc_Spec : Node_Id;
 
+      Proc_Spec : Node_Id;
       Rec_Decl  : Node_Id;
       Rec_Ent   : Entity_Id;
       Cdecls    : List_Id;
-
       Elab_Decl : Node_Id;
       Size_Decl : Node_Id;
       Body_Decl : Node_Id;
 
    begin
-      if Present (Corresponding_Record_Type (Tasktyp)) then
+      --  Do not attempt expansion if in no run time mode
+
+      if No_Run_Time
+        and then not Restricted_Profile
+      then
+         Disallow_In_No_Run_Time_Mode (N);
          return;
 
-      else
-         Rec_Decl := Build_Corresponding_Record (N, Tasktyp, Loc);
-         Rec_Ent  := Defining_Identifier (Rec_Decl);
-         Cdecls   := Component_Items
-                        (Component_List (Type_Definition (Rec_Decl)));
+      --  If already expanded, nothing to do
+
+      elsif Present (Corresponding_Record_Type (Tasktyp)) then
+         return;
       end if;
 
+      --  Here we will do the expansion
+
+      Rec_Decl := Build_Corresponding_Record (N, Tasktyp, Loc);
+      Rec_Ent  := Defining_Identifier (Rec_Decl);
+      Cdecls   := Component_Items (Component_List
+                                     (Type_Definition (Rec_Decl)));
+
       Qualify_Entity_Names (N);
 
       --  First create the elaboration variable
@@ -6994,7 +6987,7 @@ package body Exp_Ch9 is
       --  This is done last, since the corresponding record initialization
       --  procedure will reference the previously created entities.
 
-      --  Fill in the component declarations. First the _Task_Id field:
+      --  Fill in the component declarations. First the _Task_Id field.
 
       Append_To (Cdecls,
         Make_Component_Declaration (Loc,
@@ -7116,7 +7109,7 @@ package body Exp_Ch9 is
       --  Complete the expansion of access types to the current task
       --  type, if any were declared.
 
-      Expand_Previous_Access_Type (N, Tasktyp);
+      Expand_Previous_Access_Type (Tasktyp);
    end Expand_N_Task_Type_Declaration;
 
    -------------------------------
@@ -7462,7 +7455,7 @@ package body Exp_Ch9 is
          Op := First_Protected_Operation (Declarations (N));
 
          if Present (Op) then
-            Set_Discriminals (Parent (Spec_Id), Op, Sloc (N));
+            Set_Discriminals (Parent (Spec_Id));
             Set_Privals (Parent (Spec_Id), Op, Sloc (N));
          end if;
       end if;
@@ -8268,11 +8261,7 @@ package body Exp_Ch9 is
    -- Set_Discriminals --
    ----------------------
 
-   procedure Set_Discriminals
-     (Dec : Node_Id;
-      Op  : Node_Id;
-      Loc : Source_Ptr)
-   is
+   procedure Set_Discriminals (Dec : Node_Id) is
       D       : Entity_Id;
       Pdef    : Entity_Id;
       D_Minal : Entity_Id;
@@ -8497,6 +8486,21 @@ package body Exp_Ch9 is
             Update_Array_Bounds (Etype (Defining_Identifier (N)));
             return OK;
 
+         --  For array components of discriminated records, use the
+         --  base type directly, because it may depend indirectly
+         --  on the discriminants of the protected type. Cleaner would
+         --  be a systematic mechanism to compute actual subtypes of
+         --  private components ???
+
+         elsif Nkind (N) in N_Has_Etype
+           and then Present (Etype (N))
+           and then Is_Array_Type (Etype (N))
+           and then Nkind (N) = N_Selected_Component
+           and then Has_Discriminants (Etype (Prefix (N)))
+         then
+            Set_Etype (N, Base_Type (Etype (N)));
+            return OK;
+
          else
             if Nkind (N) in N_Has_Etype
               and then Present (Etype (N))