* 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, 61 insertions, 24 deletions

diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb
index 06397c74fce..e0e20b45edd 100644
--- a/gcc/ada/lib-xref.adb
+++ b/gcc/ada/lib-xref.adb
@@ -8,7 +8,7 @@
 --                                                                          --
 --                            $Revision$
 --                                                                          --
---          Copyright (C) 1998-2001, Free Software Foundation, Inc.         --
+--          Copyright (C) 1998-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- --
@@ -28,12 +28,13 @@
 
 with Atree;    use Atree;
 with Csets;    use Csets;
-with Debug;    use Debug;
+with Errout;   use Errout;
 with Lib.Util; use Lib.Util;
 with Namet;    use Namet;
 with Opt;      use Opt;
 with Sinfo;    use Sinfo;
 with Sinput;   use Sinput;
+with Stand;    use Stand;
 with Table;    use Table;
 with Widechar; use Widechar;
 
@@ -79,7 +80,7 @@ package body Lib.Xref is
 
    package Xrefs is new Table.Table (
      Table_Component_Type => Xref_Entry,
-     Table_Index_Type     => Int,
+     Table_Index_Type     => Xref_Entry_Number,
      Table_Low_Bound      => 1,
      Table_Initial        => Alloc.Xrefs_Initial,
      Table_Increment      => Alloc.Xrefs_Increment,
@@ -201,13 +202,22 @@ package body Lib.Xref is
       --  we omit this test if Typ is 'e', since these entries are
       --  really structural, and it is useful to have them in units
       --  that reference packages as well as units that define packages.
+      --  We also omit the test for the case of 'p' since we want to
+      --  include inherited primitive operations from other packages.
 
       if not In_Extended_Main_Source_Unit (N)
         and then Typ /= 'e'
+        and then Typ /= 'p'
       then
          return;
       end if;
 
+      --  For reference type p, then entity must be in main source unit
+
+      if Typ = 'p' and then not In_Extended_Main_Source_Unit (E) then
+         return;
+      end if;
+
       --  Unless the reference is forced, we ignore references where
       --  the reference itself does not come from Source.
 
@@ -227,6 +237,26 @@ package body Lib.Xref is
       if Set_Ref then
          Set_Referenced (E);
 
+         --  Check for pragma unreferenced given
+
+         if Has_Pragma_Unreferenced (E) then
+
+            --  A reference as a named parameter in a call does not count
+            --  as a violation of pragma Unreferenced for this purpose.
+
+            if Nkind (N) = N_Identifier
+              and then Nkind (Parent (N)) = N_Parameter_Association
+              and then Selector_Name (Parent (N)) = N
+            then
+               null;
+
+            --  Here we issue the warning, since this is a real reference
+
+            else
+               Error_Msg_NE ("?pragma Unreferenced given for&", N, E);
+            end if;
+         end if;
+
          --  If this is a subprogram instance, mark as well the internal
          --  subprogram in the wrapper package, which may be a visible
          --  compilation unit.
@@ -523,12 +553,6 @@ package body Lib.Xref is
                      return;
                   end if;
 
-                  --  For now, nothing to do unless special debug flag set
-
-                  if not Debug_Flag_MM then
-                     return;
-                  end if;
-
                   --  Output instantiation reference
 
                   Write_Info_Char ('[');
@@ -768,7 +792,7 @@ package body Lib.Xref is
 
                      --  Write out renaming reference if we have one
 
-                     if Debug_Flag_MM and then Present (Rref) then
+                     if Present (Rref) then
                         Write_Info_Char ('=');
                         Write_Info_Nat
                           (Int (Get_Logical_Line_Number (Sloc (Rref))));
@@ -850,20 +874,20 @@ package body Lib.Xref is
                         end if;
 
                         --  Exit if no type reference, or we are stuck in
-                        --  some loop trying to find the type reference.
+                        --  some loop trying to find the type reference, or
+                        --  if the type is standard void type (the latter is
+                        --  an implementation artifact that should not show
+                        --  up in the generated cross-references).
 
-                        exit when No (Tref) or else Tref = Sav;
+                        exit when No (Tref)
+                          or else Tref = Sav
+                          or else Tref = Standard_Void_Type;
 
                         --  Here we have a type reference to output
 
                         --  Case of standard entity, output name
 
                         if Sloc (Tref) = Standard_Location then
-
-                           --  For now, output only if special -gnatdM flag set
-
-                           exit when not Debug_Flag_MM;
-
                            Write_Info_Char (Left);
                            Write_Info_Name (Chars (Tref));
                            Write_Info_Char (Right);
@@ -873,11 +897,6 @@ package body Lib.Xref is
 
                         elsif Comes_From_Source (Tref) then
 
-                           --  For now, output only derived type entries
-                           --  unless we have special debug flag -gnatdM
-
-                           exit when not (Debug_Flag_MM or else Left = '<');
-
                            --  Do not output type reference if referenced
                            --  entity is not in the main unit and is itself
                            --  not referenced, since otherwise the reference
@@ -898,8 +917,26 @@ package body Lib.Xref is
 
                            Write_Info_Nat
                              (Int (Get_Logical_Line_Number (Sloc (Tref))));
-                           Write_Info_Char
-                             (Xref_Entity_Letters (Ekind (Tref)));
+
+                           declare
+                              Ent  : Entity_Id := Tref;
+                              Kind : constant Entity_Kind := Ekind (Ent);
+                              Ctyp : Character := Xref_Entity_Letters (Kind);
+
+                           begin
+                              if Ctyp = '+'
+                                and then Present (Full_View (Ent))
+                              then
+                                 Ent := Underlying_Type (Ent);
+
+                                 if Present (Ent) then
+                                    Ctyp := Xref_Entity_Letters (Ekind (Ent));
+                                 end if;
+                              end if;
+
+                              Write_Info_Char (Ctyp);
+                           end;
+
                            Write_Info_Nat
                              (Int (Get_Column_Number (Sloc (Tref))));
                            Write_Info_Char (Right);