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, 73 insertions, 20 deletions

diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb
index 21507a8..7d8cad1 100644
--- a/gcc/ada/sem_ch7.adb
+++ b/gcc/ada/sem_ch7.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.3 $
+--                            $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- --
@@ -300,7 +300,7 @@ package body Sem_Ch7 is
       HSS := Handled_Statement_Sequence (N);
 
       if Present (HSS) then
-         Process_End_Label (HSS, 't');
+         Process_End_Label (HSS, 't', Spec_Id);
          Analyze (HSS);
 
          --  Check that elaboration code in a preelaborable package body is
@@ -316,7 +316,7 @@ package body Sem_Ch7 is
       --  because the call will use In_Extended_Main_Source_Unit as a check,
       --  and we want to make sure that Corresponding_Stub links are set
 
-      Generate_Reference (Spec_Id, Body_Id, 'b');
+      Generate_Reference (Spec_Id, Body_Id, 'b', Set_Ref => False);
 
       --  For a generic package, collect global references and mark
       --  them on the original body so that they are not resolved
@@ -816,7 +816,7 @@ package body Sem_Ch7 is
          end;
       end if;
 
-      Process_End_Label (N, 'e');
+      Process_End_Label (N, 'e', Id);
    end Analyze_Package_Specification;
 
    --------------------------------------
@@ -851,6 +851,46 @@ package body Sem_Ch7 is
 
    procedure Declare_Inherited_Private_Subprograms (Id : Entity_Id) is
       E : Entity_Id;
+      Op_List        : Elist_Id;
+      Op_Elmt        : Elmt_Id;
+      Op_Elmt_2      : Elmt_Id;
+      Prim_Op        : Entity_Id;
+      New_Op         : Entity_Id;
+      Parent_Subp    : Entity_Id;
+      Found_Explicit : Boolean;
+      Decl_Privates  : Boolean;
+
+      function Is_Primitive_Of (T : Entity_Id; S : Entity_Id) return Boolean;
+      --  Check whether an inherited subprogram is an operation of an
+      --  untagged derived type.
+
+      ---------------------
+      -- Is_Primitive_Of --
+      ---------------------
+
+      function Is_Primitive_Of (T : Entity_Id; S : Entity_Id) return Boolean is
+         Formal : Entity_Id;
+
+      begin
+         if Etype (S) = T then
+            return True;
+
+         else
+            Formal := First_Formal (S);
+
+            while Present (Formal) loop
+               if Etype (Formal) = T then
+                  return True;
+               end if;
+
+               Next_Formal (Formal);
+            end loop;
+
+            return False;
+         end if;
+      end Is_Primitive_Of;
+
+   --  Start of processing for Declare_Inherited_Private_Subprograms
 
    begin
       E := First_Entity (Id);
@@ -862,26 +902,19 @@ package body Sem_Ch7 is
          --  inherited operations that now need to be made visible.
          --  Ditto if the entity is a formal derived type in a child unit.
 
-         if Is_Tagged_Type (E)
-           and then
-             ((Is_Derived_Type (E) and then not Is_Private_Type (E))
+         if ((Is_Derived_Type (E) and then not Is_Private_Type (E))
                or else
              (Nkind (Parent (E)) = N_Private_Extension_Declaration
                and then Is_Generic_Type (E)))
            and then In_Open_Scopes (Scope (Etype (E)))
            and then E = Base_Type (E)
          then
-            declare
-               Op_List        : constant Elist_Id := Primitive_Operations (E);
-               Op_Elmt        : Elmt_Id := First_Elmt (Op_List);
-               Op_Elmt_2      : Elmt_Id;
-               Prim_Op        : Entity_Id;
-               New_Op         : Entity_Id := Empty;
-               Parent_Subp    : Entity_Id;
-               Found_Explicit : Boolean;
-               Decl_Privates  : Boolean := False;
+            if Is_Tagged_Type (E) then
+               Op_List       := Primitive_Operations (E);
+               Op_Elmt       := First_Elmt (Op_List);
+               New_Op        := Empty;
+               Decl_Privates := False;
 
-            begin
                while Present (Op_Elmt) loop
                   Prim_Op := Node (Op_Elmt);
 
@@ -963,7 +996,27 @@ package body Sem_Ch7 is
                then
                   Set_All_DT_Position (E);
                end if;
-            end;
+
+            else
+               --   Non-tagged type, scan forward to locate
+               --   inherited hidden operations.
+
+               Prim_Op := Next_Entity (E);
+
+               while Present (Prim_Op) loop
+                  if Is_Subprogram (Prim_Op)
+                    and then Present (Alias (Prim_Op))
+                    and then not Comes_From_Source (Prim_Op)
+                    and then Is_Internal_Name (Chars (Prim_Op))
+                    and then not Is_Internal_Name (Chars (Alias (Prim_Op)))
+                    and then Is_Primitive_Of (E, Prim_Op)
+                  then
+                     Derive_Subprogram (New_Op, Alias (Prim_Op), E, Etype (E));
+                  end if;
+
+                  Next_Entity (Prim_Op);
+               end loop;
+            end if;
          end if;
 
          Next_Entity (E);
@@ -1355,9 +1408,9 @@ package body Sem_Ch7 is
 
       if Priv_Is_Base_Type then
          Set_Is_Controlled            (Priv, Is_Controlled (Base_Type (Full)));
-         Set_Has_Task                 (Priv, Has_Task      (Base_Type (Full)));
          Set_Finalize_Storage_Only    (Priv, Finalize_Storage_Only
                                                            (Base_Type (Full)));
+         Set_Has_Task                 (Priv, Has_Task      (Base_Type (Full)));
          Set_Has_Controlled_Component (Priv, Has_Controlled_Component
                                                            (Base_Type (Full)));
       end if;