summaryrefslogtreecommitdiff
path: root/gcc/ada/freeze.adb
diff options
context:
space:
mode:
authorbosch <bosch@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-08 20:11:04 +0000
committerbosch <bosch@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-08 20:11:04 +0000
commitf15731c43ae5e8cea424ea40f905c19afa1bd2e4 (patch)
treeb584a79288c93215b05fb451943291ccd039388b /gcc/ada/freeze.adb
parent1d347c236ad815c77bd345611ed221b0bd6091de (diff)
downloadgcc-f15731c43ae5e8cea424ea40f905c19afa1bd2e4.tar.gz
* 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
Diffstat (limited to 'gcc/ada/freeze.adb')
-rw-r--r--gcc/ada/freeze.adb201
1 files changed, 173 insertions, 28 deletions
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 55a98104f57..7fe7f8affb3 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -8,7 +8,7 @@
-- --
-- $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- --
@@ -36,6 +36,7 @@ with Exp_Ch11; use Exp_Ch11;
with Exp_Pakd; use Exp_Pakd;
with Exp_Util; use Exp_Util;
with Layout; use Layout;
+with Lib.Xref; use Lib.Xref;
with Nlists; use Nlists;
with Nmake; use Nmake;
with Opt; use Opt;
@@ -248,7 +249,18 @@ package body Freeze is
end if;
if Is_Entity_Name (Nam) then
- Call_Name := New_Reference_To (Old_S, Loc);
+
+ -- If the renamed entity is a predefined operator, retain full
+ -- name to ensure its visibility.
+
+ if Ekind (Old_S) = E_Operator
+ and then Nkind (Nam) = N_Expanded_Name
+ then
+ Call_Name := New_Copy (Name (N));
+ else
+ Call_Name := New_Reference_To (Old_S, Loc);
+ end if;
+
else
Call_Name := New_Copy (Name (N));
@@ -291,6 +303,8 @@ package body Freeze is
-- in the declaration. However, default values that are aggregates
-- are rewritten when partially analyzed, so we recover the original
-- aggregate to insure that subsequent conformity checking works.
+ -- Similarly, if the default expression was constant-folded, recover
+ -- the original expression.
Formal := First_Formal (Defining_Entity (Decl));
@@ -308,7 +322,10 @@ package body Freeze is
Set_Entity (Parameter_Type (Param_Spec), Etype (O_Formal));
end if;
- elsif Nkind (Default_Value (O_Formal)) = N_Aggregate then
+ elsif Nkind (Default_Value (O_Formal)) = N_Aggregate
+ or else Nkind (Original_Node (Default_Value (O_Formal))) /=
+ Nkind (Default_Value (O_Formal))
+ then
Set_Expression (Param_Spec,
New_Copy_Tree (Original_Node (Default_Value (O_Formal))));
end if;
@@ -409,9 +426,7 @@ package body Freeze is
-- to give a smaller size.
function Size_Known (T : Entity_Id) return Boolean;
- -- Recursive function that does all the work.
- -- Is this right??? isn't recursive case already handled???
- -- certainly yes for normal call, but what about bogus sem_res call???
+ -- Recursive function that does all the work
function Static_Discriminated_Components (T : Entity_Id) return Boolean;
-- If T is a constrained subtype, its size is not known if any of its
@@ -468,9 +483,6 @@ package body Freeze is
if Size_Known_At_Compile_Time (T) then
return True;
- elsif Error_Posted (T) then
- return False;
-
elsif Is_Scalar_Type (T)
or else Is_Task_Type (T)
then
@@ -485,6 +497,12 @@ package body Freeze is
elsif not Is_Constrained (T) then
return False;
+ -- Don't do any recursion on type with error posted, since
+ -- we may have a malformed type that leads us into a loop
+
+ elsif Error_Posted (T) then
+ return False;
+
elsif not Size_Known (Component_Type (T)) then
return False;
end if;
@@ -541,7 +559,14 @@ package body Freeze is
and then not Is_Generic_Type (T)
and then Present (Underlying_Type (T))
then
- return Size_Known (Underlying_Type (T));
+ -- Don't do any recursion on type with error posted, since
+ -- we may have a malformed type that leads us into a loop
+
+ if Error_Posted (T) then
+ return False;
+ else
+ return Size_Known (Underlying_Type (T));
+ end if;
elsif Is_Record_Type (T) then
if Is_Class_Wide_Type (T) then
@@ -551,6 +576,12 @@ package body Freeze is
return Size_Known_At_Compile_Time (Base_Type (T))
and then Static_Discriminated_Components (T);
+ -- Don't do any recursion on type with error posted, since
+ -- we may have a malformed type that leads us into a loop
+
+ elsif Error_Posted (T) then
+ return False;
+
else
declare
Packed_Size_Known : Boolean := Is_Packed (T);
@@ -1218,6 +1249,17 @@ package body Freeze is
end if;
end;
+ -- If this is a constrained subtype of an already frozen type,
+ -- make the subtype frozen as well. It might otherwise be frozen
+ -- in the wrong scope, and a freeze node on subtype has no effect.
+
+ elsif Is_Access_Type (Etype (Comp))
+ and then not Is_Frozen (Designated_Type (Etype (Comp)))
+ and then Is_Itype (Designated_Type (Etype (Comp)))
+ and then Is_Frozen (Base_Type (Designated_Type (Etype (Comp))))
+ then
+ Set_Is_Frozen (Designated_Type (Etype (Comp)));
+
elsif Is_Array_Type (Etype (Comp))
and then Is_Access_Type (Component_Type (Etype (Comp)))
and then Present (Parent (Comp))
@@ -1250,9 +1292,11 @@ package body Freeze is
if Present (CC) then
Placed_Component := True;
- if not Size_Known_At_Compile_Time
+ if Inside_A_Generic then
+ null;
+
+ elsif not Size_Known_At_Compile_Time
(Underlying_Type (Etype (Comp)))
- and then not Inside_A_Generic
then
Error_Msg_N
("component clause not allowed for variable " &
@@ -1827,9 +1871,12 @@ package body Freeze is
Next_Index (Indx);
end loop;
- -- For base type, propagate flags for component type
+ -- Processing that is done only for base types
if Ekind (E) = E_Array_Type then
+
+ -- Propagate flags for component type
+
if Is_Controlled (Component_Type (E))
or else Has_Controlled_Component (Ctyp)
then
@@ -1839,18 +1886,16 @@ package body Freeze is
if Has_Unchecked_Union (Component_Type (E)) then
Set_Has_Unchecked_Union (E);
end if;
- end if;
- -- If packing was requested or if the component size was set
- -- explicitly, then see if bit packing is required. This
- -- processing is only done for base types, since all the
- -- representation aspects involved are type-related. This
- -- is not just an optimization, if we start processing the
- -- subtypes, they intefere with the settings on the base
- -- type (this is because Is_Packed has a slightly different
- -- meaning before and after freezing).
+ -- If packing was requested or if the component size was set
+ -- explicitly, then see if bit packing is required. This
+ -- processing is only done for base types, since all the
+ -- representation aspects involved are type-related. This
+ -- is not just an optimization, if we start processing the
+ -- subtypes, they intefere with the settings on the base
+ -- type (this is because Is_Packed has a slightly different
+ -- meaning before and after freezing).
- if E = Base_Type (E) then
declare
Csiz : Uint;
Esiz : Uint;
@@ -1939,6 +1984,63 @@ package body Freeze is
end if;
end if;
end;
+
+ -- Processing that is done only for subtypes
+
+ else
+ -- Acquire alignment from base type
+
+ if Unknown_Alignment (E) then
+ Set_Alignment (E, Alignment (Base_Type (E)));
+ end if;
+ end if;
+
+ -- Check one common case of a size given where the array
+ -- needs to be packed, but was not so the size cannot be
+ -- honored. This would of course be caught by the backend,
+ -- and indeed we don't catch all cases. The point is that
+ -- we can give a better error message in those cases that
+ -- we do catch with the circuitry here.
+
+ if Present (Size_Clause (E))
+ and then Known_Static_Esize (E)
+ and then not Has_Pragma_Pack (E)
+ and then Number_Dimensions (E) = 1
+ and then not Has_Component_Size_Clause (E)
+ and then Known_Static_Component_Size (E)
+ then
+ declare
+ Lo, Hi : Node_Id;
+ Ctyp : constant Entity_Id := Component_Type (E);
+
+ begin
+ Get_Index_Bounds (First_Index (E), Lo, Hi);
+
+ if Compile_Time_Known_Value (Lo)
+ and then Compile_Time_Known_Value (Hi)
+ and then Known_Static_RM_Size (Ctyp)
+ and then RM_Size (Ctyp) < 64
+ then
+ declare
+ Lov : constant Uint := Expr_Value (Lo);
+ Hiv : constant Uint := Expr_Value (Hi);
+ Len : constant Uint :=
+ UI_Max (Uint_0, Hiv - Lov + 1);
+
+ begin
+ if Esize (E) < Len * Component_Size (E)
+ and then Esize (E) = Len * RM_Size (Ctyp)
+ then
+ Error_Msg_NE
+ ("size given for& too small",
+ Size_Clause (E), E);
+ Error_Msg_N
+ ("\explicit pragma Pack is required",
+ Size_Clause (E));
+ end if;
+ end;
+ end if;
+ end;
end if;
-- If any of the index types was an enumeration type with
@@ -2241,10 +2343,10 @@ package body Freeze is
elsif Has_Discriminants (E)
and Is_Constrained (E)
then
-
declare
Constraint : Elmt_Id;
Expr : Node_Id;
+
begin
Constraint := First_Elmt (Discriminant_Constraint (E));
@@ -2285,9 +2387,10 @@ package body Freeze is
then
declare
Prim_List : constant Elist_Id := Primitive_Operations (E);
- Prim : Elmt_Id := First_Elmt (Prim_List);
+ Prim : Elmt_Id;
begin
+ Prim := First_Elmt (Prim_List);
while Present (Prim) loop
if Convention (Node (Prim)) = Convention_Ada then
Set_Convention (Node (Prim), Convention (E));
@@ -2299,6 +2402,43 @@ package body Freeze is
end if;
end if;
+ -- Generate primitive operation references for a tagged type
+
+ if Is_Tagged_Type (E)
+ and then not Is_Class_Wide_Type (E)
+ then
+ declare
+ Prim_List : constant Elist_Id := Primitive_Operations (E);
+ Prim : Elmt_Id;
+ Ent : Entity_Id;
+
+ begin
+ Prim := First_Elmt (Prim_List);
+ while Present (Prim) loop
+ Ent := Node (Prim);
+
+ -- If the operation is derived, get the original for
+ -- cross-reference purposes (it is the original for
+ -- which we want the xref, and for which the comes
+ -- from source test needs to be performed).
+
+ while Present (Alias (Ent)) loop
+ Ent := Alias (Ent);
+ end loop;
+
+ Generate_Reference (E, Ent, 'p', Set_Ref => False);
+ Next_Elmt (Prim);
+ end loop;
+
+ -- If we get an exception, then something peculiar has happened
+ -- probably as a result of a previous error. Since this is only
+ -- for non-critical cross-references, ignore the error.
+
+ exception
+ when others => null;
+ end;
+ end if;
+
-- Now that all types from which E may depend are frozen, see
-- if the size is known at compile time, if it must be unsigned,
-- or if strict alignent is required
@@ -2316,9 +2456,14 @@ package body Freeze is
if Has_Size_Clause (E)
and then not Size_Known_At_Compile_Time (E)
then
- Error_Msg_N
- ("size clause not allowed for variable length type",
- Size_Clause (E));
+ -- Supress this message if errors posted on E, even if we are
+ -- in all errors mode, since this is often a junk message
+
+ if not Error_Posted (E) then
+ Error_Msg_N
+ ("size clause not allowed for variable length type",
+ Size_Clause (E));
+ end if;
end if;
-- Remaining process is to set/verify the representation information,