2003-10-21 Arnaud Charlet <charlet@act-europe.fr>

	* 3psoccon.ads, 3veacodu.adb, 3vexpect.adb, 3vsoccon.ads,
	3vsocthi.adb, 3vsocthi.ads, 3vtrasym.adb, 3zsoccon.ads,
	3zsocthi.adb, 3zsocthi.ads, 50system.ads, 51system.ads,
	55system.ads, 56osinte.adb, 56osinte.ads, 56taprop.adb,
	56taspri.ads, 56tpopsp.adb, 57system.ads, 58system.ads,
	59system.ads, 5aml-tgt.adb, 5bml-tgt.adb, 5csystem.ads,
	5dsystem.ads, 5fosinte.adb, 5gml-tgt.adb, 5hml-tgt.adb,
	5isystem.ads, 5lparame.adb, 5msystem.ads, 5psystem.ads,
	5sml-tgt.adb, 5sosprim.adb, 5stpopsp.adb, 5tsystem.ads,
	5usystem.ads, 5vml-tgt.adb, 5vsymbol.adb, 5vtraent.adb,
	5vtraent.ads, 5wml-tgt.adb, 5xparame.ads, 5xsystem.ads,
	5xvxwork.ads, 5yparame.ads, 5ytiitho.adb, 5zinit.adb,
	5zml-tgt.adb, 5zparame.ads, 5ztaspri.ads, 5ztfsetr.adb,
	5zthrini.adb, 5ztiitho.adb, 5ztpopsp.adb, 7stfsetr.adb,
	7straces.adb, 7strafor.adb, 7strafor.ads, 7stratas.adb,
	a-excach.adb, a-exexda.adb, a-exexpr.adb, a-exextr.adb,
	a-exstat.adb, a-strsup.adb, a-strsup.ads, a-stwisu.adb,
	a-stwisu.ads, bld.adb, bld.ads, bld-io.adb,
	bld-io.ads, clean.adb, clean.ads, ctrl_c.c,
	erroutc.adb, erroutc.ads, errutil.adb, errutil.ads,
	err_vars.ads, final.c, g-arrspl.adb, g-arrspl.ads,
	g-boubuf.adb, g-boubuf.ads, g-boumai.ads, g-bubsor.adb,
	g-bubsor.ads, g-comver.adb, g-comver.ads, g-ctrl_c.ads,
	g-dynhta.adb, g-dynhta.ads, g-eacodu.adb, g-excact.adb,
	g-excact.ads, g-heasor.adb, g-heasor.ads, g-memdum.adb,
	g-memdum.ads, gnatclean.adb, gnatsym.adb, g-pehage.adb,
	g-pehage.ads, g-perhas.ads, gpr2make.adb, gpr2make.ads,
	gprcmd.adb, gprep.adb, gprep.ads, g-semaph.adb,
	g-semaph.ads, g-string.adb, g-string.ads, g-strspl.ads,
	g-wistsp.ads, i-vthrea.adb, i-vthrea.ads, i-vxwoio.adb,
	i-vxwoio.ads, Makefile.generic, Makefile.prolog, Makefile.rtl,
	prep.adb, prep.ads, prepcomp.adb, prepcomp.ads,
	prj-err.adb, prj-err.ads, s-boarop.ads, s-carsi8.adb,
	s-carsi8.ads, s-carun8.adb, s-carun8.ads, s-casi16.adb,
	s-casi16.ads, s-casi32.adb, s-casi32.ads, s-casi64.adb,
	s-casi64.ads, s-casuti.adb, s-casuti.ads, s-caun16.adb,
	s-caun16.ads, s-caun32.adb, s-caun32.ads, s-caun64.adb,
	s-caun64.ads, scng.adb, scng.ads, s-exnint.adb,
	s-exnllf.adb, s-exnlli.adb, s-expint.adb, s-explli.adb,
	s-geveop.adb, s-geveop.ads, s-hibaen.ads, s-htable.adb,
	s-htable.ads, sinput-c.adb, sinput-c.ads, s-memcop.ads,
	socket.c, s-purexc.ads, s-scaval.adb, s-stopoo.adb,
	s-strcom.adb, s-strcom.ads, s-strxdr.adb, s-rident.ads,
	s-thread.adb, s-thread.ads, s-tpae65.adb, s-tpae65.ads,
	s-tporft.adb, s-traent.adb, s-traent.ads, styleg.adb,
	styleg.ads, styleg-c.adb, styleg-c.ads, s-veboop.adb,
	s-veboop.ads, s-vector.ads, symbols.adb, symbols.ads,
	tb-alvms.c, tb-alvxw.c, tempdir.adb, tempdir.ads,
	vms_conv.ads, vms_conv.adb, vms_data.ads,
	vxaddr2line.adb: Files added. Merge with ACT tree.

	* 4dintnam.ads, 4mintnam.ads, 4uintnam.ads, 52system.ads,
	5dosinte.ads, 5etpopse.adb, 5mosinte.ads, 5qosinte.adb,
	5qosinte.ads, 5qstache.adb, 5qtaprop.adb, 5qtaspri.ads,
	5stpopse.adb, 5uintman.adb, 5uosinte.ads, adafinal.c,
	g-enblsp.adb, io-aux.c, scn-nlit.adb, scn-slit.adb,
	s-exnflt.ads, s-exngen.adb, s-exngen.ads, s-exnlfl.ads,
	s-exnlin.ads, s-exnsfl.ads, s-exnsin.ads, s-exnssi.ads,
	s-expflt.ads, s-expgen.adb, s-expgen.ads, s-explfl.ads,
	s-explin.ads, s-expllf.ads, s-expsfl.ads, s-expsin.ads,
	s-expssi.ads, style.adb: Files removed. Merge with ACT tree.

	* 1ic.ads, 31soccon.ads, 31soliop.ads, 3asoccon.ads,
	3bsoccon.ads, 3gsoccon.ads, 3hsoccon.ads, 3ssoccon.ads,
	3ssoliop.ads, 3wsoccon.ads, 3wsocthi.adb, 3wsocthi.ads,
	3wsoliop.ads, 41intnam.ads, 42intnam.ads, 4aintnam.ads,
	4cintnam.ads, 4gintnam.ads, 4hexcpol.adb, 4hintnam.ads,
	4lintnam.ads, 4nintnam.ads, 4ointnam.ads, 4onumaux.ads,
	4pintnam.ads, 4sintnam.ads, 4vcaldel.adb, 4vcalend.adb,
	4vintnam.ads, 4wexcpol.adb, 4wintnam.ads, 4zintnam.ads,
	51osinte.adb, 51osinte.ads, 52osinte.adb, 52osinte.ads,
	53osinte.ads, 54osinte.ads, 5aosinte.adb, 5aosinte.ads,
	5asystem.ads, 5ataprop.adb, 5atasinf.ads, 5ataspri.ads,
	5atpopsp.adb, 5avxwork.ads, 5bosinte.adb, 5bosinte.ads,
	5bsystem.ads, 5cosinte.ads, 5esystem.ads, 5fintman.adb,
	5fosinte.ads, 5fsystem.ads, 5ftaprop.adb, 5ftasinf.ads,
	5ginterr.adb, 5gintman.adb, 5gmastop.adb, 5gosinte.ads,
	5gproinf.ads, 5gsystem.ads, 5gtaprop.adb, 5gtasinf.ads,
	5gtpgetc.adb, 5hosinte.adb, 5hosinte.ads, 5hsystem.ads,
	5htaprop.adb, 5htaspri.ads, 5htraceb.adb, 5iosinte.adb,
	5itaprop.adb, 5itaspri.ads, 5ksystem.ads, 5kvxwork.ads,
	5lintman.adb, 5lml-tgt.adb, 5losinte.ads, 5lsystem.ads,
	5mvxwork.ads, 5ninmaop.adb, 5nintman.adb, 5nosinte.ads,
	5ntaprop.adb, 5ntaspri.ads, 5ointerr.adb, 5omastop.adb,
	5oosinte.adb, 5oosinte.ads, 5oosprim.adb, 5oparame.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5posinte.ads,
	5posprim.adb, 5pvxwork.ads, 5sintman.adb, 5sosinte.adb,
	5sosinte.ads, 5ssystem.ads, 5staprop.adb, 5stasinf.ads,
	5staspri.ads, 5svxwork.ads, 5tosinte.ads, 5vasthan.adb,
	5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vintman.ads,
	5vmastop.adb, 5vosinte.adb, 5vosinte.ads, 5vosprim.adb,
	5vsystem.ads, 5vtaprop.adb, 5vtaspri.ads, 5vtpopde.adb,
	5vtpopde.ads, 5wgloloc.adb, 5wintman.adb, 5wmemory.adb,
	5wosprim.adb, 5wsystem.ads, 5wtaprop.adb, 5wtaspri.ads,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zosprim.adb, 5zsystem.ads, 5ztaprop.adb,
	6vcpp.adb, 6vcstrea.adb, 6vinterf.ads, 7sinmaop.adb,
	7sintman.adb, 7sosinte.adb, 7sosprim.adb, 7staprop.adb,
	7staspri.ads, 7stpopsp.adb, 7straceb.adb, 9drpc.adb,
	a-caldel.adb, a-caldel.ads, a-charac.ads, a-colien.ads,
	a-comlin.adb, adaint.c, adaint.h, ada-tree.def,
	a-diocst.adb, a-diocst.ads, a-direio.adb, a-except.adb,
	a-except.ads, a-excpol.adb, a-exctra.adb, a-exctra.ads,
	a-filico.adb, a-interr.adb, a-intsig.adb, a-intsig.ads,
	ali.adb, ali.ads, ali-util.adb, ali-util.ads,
	a-ngcefu.adb, a-ngcoty.adb, a-ngelfu.adb, a-nudira.adb,
	a-nudira.ads, a-nuflra.adb, a-nuflra.ads, a-reatim.adb,
	a-reatim.ads, a-retide.ads, a-sequio.adb, a-siocst.adb,
	a-siocst.ads, a-ssicst.adb, a-ssicst.ads, a-strbou.adb,
	a-strbou.ads, a-strfix.adb, a-strmap.adb, a-strsea.ads,
	a-strunb.adb, a-strunb.ads, a-ststio.adb, a-stunau.adb,
	a-stunau.ads, a-stwibo.adb, a-stwibo.ads, a-stwifi.adb,
	a-stwima.adb, a-stwiun.adb, a-stwiun.ads, a-tags.adb,
	a-tags.ads, a-tasatt.adb, a-taside.adb, a-teioed.adb,
	a-textio.adb, a-textio.ads, a-tienau.adb, a-tifiio.adb,
	a-tiflau.adb, a-tiflio.adb, a-tigeau.adb, a-tigeau.ads,
	a-tiinau.adb, a-timoau.adb, a-tiocst.adb, a-tiocst.ads,
	atree.adb, atree.ads, a-witeio.adb, a-witeio.ads,
	a-wtcstr.adb, a-wtcstr.ads, a-wtdeio.adb, a-wtedit.adb,
	a-wtenau.adb, a-wtflau.adb, a-wtinau.adb, a-wtmoau.adb,
	bcheck.adb, binde.adb, bindgen.adb, bindusg.adb,
	checks.adb, checks.ads, cio.c, comperr.adb,
	comperr.ads, csets.adb, cstand.adb, cstreams.c,
	debug_a.adb, debug_a.ads, debug.adb, decl.c,
	einfo.adb, einfo.ads, errout.adb, errout.ads,
	eval_fat.adb, eval_fat.ads, exp_aggr.adb, expander.adb,
	expander.ads, exp_attr.adb, exp_ch11.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_ch8.adb, exp_ch9.adb, exp_code.adb, exp_dbug.adb,
	exp_dbug.ads, exp_disp.adb, exp_dist.adb, expect.c,
	exp_fixd.adb, exp_imgv.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_strm.ads, exp_tss.adb,
	exp_tss.ads, exp_util.adb, exp_util.ads, exp_vfpt.adb,
	fe.h, fmap.adb, fmap.ads, fname.adb,
	fname.ads, fname-uf.adb, fname-uf.ads, freeze.adb,
	freeze.ads, frontend.adb, g-awk.adb, g-awk.ads,
	g-busora.adb, g-busora.ads, g-busorg.adb, g-busorg.ads,
	g-casuti.adb, g-casuti.ads, g-catiio.adb, g-catiio.ads,
	g-cgi.adb, g-cgi.ads, g-cgicoo.adb, g-cgicoo.ads,
	g-cgideb.adb, g-cgideb.ads, g-comlin.adb, g-comlin.ads,
	g-crc32.adb, g-crc32.ads, g-debpoo.adb, g-debpoo.ads,
	g-debuti.adb, g-debuti.ads, g-diopit.adb, g-diopit.ads,
	g-dirope.adb, g-dirope.ads, g-dyntab.adb, g-dyntab.ads,
	g-except.ads, g-exctra.adb, g-exctra.ads, g-expect.adb,
	g-expect.ads, g-hesora.adb, g-hesora.ads, g-hesorg.adb,
	g-hesorg.ads, g-htable.adb, g-htable.ads, gigi.h,
	g-io.adb, g-io.ads, g-io_aux.adb, g-io_aux.ads,
	g-locfil.adb, g-locfil.ads, g-md5.adb, g-md5.ads,
	gmem.c, gnat1drv.adb, gnatbind.adb, gnatchop.adb,
	gnatcmd.adb, gnatfind.adb, gnatkr.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmake.adb, gnatmem.adb,
	gnatname.adb, gnatprep.adb, gnatprep.ads, gnatpsta.adb,
	gnatxref.adb, g-os_lib.adb, g-os_lib.ads, g-regexp.adb,
	g-regexp.ads, g-regist.adb, g-regist.ads, g-regpat.adb,
	g-regpat.ads, g-soccon.ads, g-socket.adb, g-socket.ads,
	g-socthi.adb, g-socthi.ads, g-soliop.ads, g-souinf.ads,
	g-speche.adb, g-speche.ads, g-spipat.adb, g-spipat.ads,
	g-spitbo.adb, g-spitbo.ads, g-sptabo.ads, g-sptain.ads,
	g-sptavs.ads, g-table.adb, g-table.ads, g-tasloc.adb,
	g-tasloc.ads, g-thread.adb, g-thread.ads, g-traceb.adb,
	g-traceb.ads, g-trasym.adb, g-trasym.ads, hostparm.ads,
	i-c.ads, i-cobol.adb, i-cpp.adb, i-cstrea.ads,
	i-cstrin.adb, i-cstrin.ads, impunit.adb, init.c,
	inline.adb, interfac.ads, i-pacdec.ads, itypes.adb,
	itypes.ads, i-vxwork.ads, lang.opt, lang-specs.h,
	layout.adb, lib.adb, lib.ads, lib-list.adb,
	lib-load.adb, lib-load.ads, lib-sort.adb, lib-util.adb,
	lib-writ.adb, lib-writ.ads, lib-xref.adb, lib-xref.ads,
	link.c, live.adb, make.adb, make.ads,
	Makefile.adalib, Makefile.in, Make-lang.in, makeusg.adb,
	mdll.adb, mdll-fil.adb, mdll-fil.ads, mdll-utl.adb,
	mdll-utl.ads, memroot.adb, memroot.ads, memtrack.adb,
	misc.c, mkdir.c, mlib.adb, mlib.ads,
	mlib-fil.adb, mlib-fil.ads, mlib-prj.adb, mlib-prj.ads,
	mlib-tgt.adb, mlib-tgt.ads, mlib-utl.adb, mlib-utl.ads,
	namet.adb, namet.ads, namet.h, nlists.ads,
	nlists.h, nmake.adt, opt.adb, opt.ads,
	osint.adb, osint.ads, osint-b.adb, osint-c.adb,
	par.adb, par-ch10.adb, par-ch11.adb, par-ch2.adb,
	par-ch3.adb, par-ch4.adb, par-ch5.adb, par-ch6.adb,
	par-ch9.adb, par-endh.adb, par-labl.adb, par-load.adb,
	par-prag.adb, par-sync.adb, par-tchk.adb, par-util.adb,
	prj.adb, prj.ads, prj-attr.adb, prj-attr.ads,
	prj-com.adb, prj-com.ads, prj-dect.adb, prj-dect.ads,
	prj-env.adb, prj-env.ads, prj-ext.adb, prj-ext.ads,
	prj-makr.adb, prj-makr.ads, prj-nmsc.adb, prj-nmsc.ads,
	prj-pars.adb, prj-pars.ads, prj-part.adb, prj-part.ads,
	prj-pp.adb, prj-pp.ads, prj-proc.adb, prj-proc.ads,
	prj-strt.adb, prj-strt.ads, prj-tree.adb, prj-tree.ads,
	prj-util.adb, prj-util.ads, raise.c, raise.h,
	repinfo.adb, repinfo.h, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-addima.ads,
	s-arit64.adb, s-assert.adb, s-assert.ads, s-atacco.adb,
	s-atacco.ads, s-auxdec.adb, s-auxdec.ads, s-bitops.adb,
	scans.ads, scn.adb, scn.ads, s-crc32.adb,
	s-crc32.ads, s-direio.adb, sem.adb, sem.ads,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_case.ads, sem_cat.adb, sem_cat.ads, sem_ch10.adb,
	sem_ch11.adb, sem_ch12.adb, sem_ch12.ads, sem_ch13.adb,
	sem_ch13.ads, sem_ch3.adb, sem_ch3.ads, sem_ch4.adb,
	sem_ch5.adb, sem_ch5.ads, sem_ch6.adb, sem_ch6.ads,
	sem_ch7.adb, sem_ch7.ads, sem_ch8.adb, sem_ch8.ads,
	sem_ch9.adb, sem_disp.adb, sem_disp.ads, sem_dist.adb,
	sem_elab.adb, sem_eval.adb, sem_eval.ads, sem_intr.adb,
	sem_maps.adb, sem_mech.adb, sem_prag.adb, sem_prag.ads,
	sem_res.adb, sem_res.ads, sem_type.adb, sem_type.ads,
	sem_util.adb, sem_util.ads, sem_warn.adb, s-errrep.adb,
	s-errrep.ads, s-exctab.adb, s-exctab.ads, s-exnint.ads,
	s-exnllf.ads, s-exnlli.ads, s-expint.ads, s-explli.ads,
	s-expuns.ads, s-fatflt.ads, s-fatgen.adb, s-fatgen.ads,
	s-fatlfl.ads, s-fatllf.ads, s-fatsfl.ads, s-fileio.adb,
	s-fileio.ads, s-finimp.adb, s-finimp.ads, s-finroo.adb,
	s-finroo.ads, sfn_scan.adb, s-gloloc.adb, s-gloloc.ads,
	s-imgdec.adb, s-imgenu.adb, s-imgrea.adb, s-imgwch.adb,
	sinfo.adb, sinfo.ads, s-inmaop.ads, sinput.adb,
	sinput.ads, sinput-d.adb, sinput-l.adb, sinput-l.ads,
	sinput-p.adb, sinput-p.ads, s-interr.adb, s-interr.ads,
	s-intman.ads, s-maccod.ads, s-mastop.adb, s-mastop.ads,
	s-memory.adb, s-memory.ads, snames.adb, snames.ads,
	snames.h, s-osprim.ads, s-parame.ads, s-parint.ads,
	s-pooloc.adb, s-pooloc.ads, s-poosiz.adb, sprint.adb,
	s-proinf.ads, s-scaval.ads, s-secsta.adb, s-secsta.ads,
	s-sequio.adb, s-shasto.adb, s-shasto.ads, s-soflin.ads,
	s-stache.adb, s-stache.ads, s-stalib.adb, s-stalib.ads,
	s-stoele.ads, s-stopoo.ads, s-stratt.adb, s-stratt.ads,
	s-strops.adb, s-strops.ads, 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-taprob.ads,
	s-taprop.ads, s-tarest.adb, s-tarest.ads, s-tasdeb.adb,
	s-tasdeb.ads, s-tasinf.adb, s-tasinf.ads, 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-tasres.ads,
	s-tassta.adb, s-tassta.ads, s-tasuti.adb, s-tasuti.ads,
	s-tataat.adb, s-tataat.ads, s-tpinop.adb, s-tpinop.ads,
	s-tpoben.adb, s-tpoben.ads, s-tpobop.adb, s-tpobop.ads,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	stringt.adb, stringt.ads, stringt.h, style.ads,
	stylesw.adb, stylesw.ads, s-unstyp.ads, s-vaflop.ads,
	s-valrea.adb, s-valuti.adb, s-vercon.adb, s-vmexta.adb,
	s-wchcnv.ads, s-wchcon.ads, s-widcha.adb, switch.adb,
	switch.ads, switch-b.adb, switch-c.adb, switch-m.adb,
	s-wwdcha.adb, s-wwdwch.adb, sysdep.c, system.ads,
	table.adb, table.ads, targparm.adb, targparm.ads,
	targtyps.c, tbuild.adb, tbuild.ads, tracebak.c,
	trans.c, tree_io.adb, treepr.adb, treeprs.adt,
	ttypes.ads, types.ads, types.h, uintp.adb,
	uintp.ads, uintp.h, uname.adb, urealp.adb,
	urealp.ads, urealp.h, usage.adb, utils2.c,
	utils.c, validsw.adb, validsw.ads, widechar.adb,
	xeinfo.adb, xnmake.adb, xref_lib.adb, xref_lib.ads,
	xr_tabls.adb, xr_tabls.ads, xtreeprs.adb, xsnames.adb,
	einfo.h, sinfo.h, treeprs.ads, nmake.ads, nmake.adb,
	gnatvsn.ads: Merge with ACT tree.

	* gnatvsn.adb: Rewritten in a simpler and more efficient way.


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

1 files changed, 587 insertions, 118 deletions

diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index a05d36f5a56..f9844cd3b33 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2002, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2003, 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- --
@@ -31,15 +31,16 @@
 with Atree;    use Atree;
 with Debug;    use Debug;
 with Einfo;    use Einfo;
+with Errout;   use Errout;
 with Exp_Ch9;  use Exp_Ch9;
 with Exp_Ch11; use Exp_Ch11;
 with Exp_Dbug; use Exp_Dbug;
 with Exp_Tss;  use Exp_Tss;
 with Exp_Util; use Exp_Util;
+with Fname;    use Fname;
 with Freeze;   use Freeze;
 with Hostparm; use Hostparm;
 with Lib;      use Lib;
-with Lib.Xref; use Lib.Xref;
 with Nlists;   use Nlists;
 with Nmake;    use Nmake;
 with Opt;      use Opt;
@@ -168,10 +169,10 @@ package body Exp_Ch7 is
                      Adjust_Case     => Name_Adjust,
                      Finalize_Case   => Name_Finalize);
 
-   Deep_Name_Of : constant array (Final_Primitives) of Name_Id :=
-                    (Initialize_Case => Name_uDeep_Initialize,
-                     Adjust_Case     => Name_uDeep_Adjust,
-                     Finalize_Case   => Name_uDeep_Finalize);
+   Deep_Name_Of : constant array (Final_Primitives) of TSS_Name_Type :=
+                    (Initialize_Case => TSS_Deep_Initialize,
+                     Adjust_Case     => TSS_Deep_Adjust,
+                     Finalize_Case   => TSS_Deep_Finalize);
 
    procedure Build_Record_Deep_Procs (Typ : Entity_Id);
    --  Build the deep Initialize/Adjust/Finalize for a record Typ with
@@ -209,6 +210,24 @@ package body Exp_Ch7 is
    --  according to the first parameter, these procedures operate on the
    --  record type Typ.
 
+   procedure Check_Visibly_Controlled
+     (Prim : Final_Primitives;
+      Typ  : Entity_Id;
+      E    : in out Entity_Id;
+      Cref : in out Node_Id);
+   --  The controlled operation declared for a derived type may not be
+   --  overriding, if the controlled operations of the parent type are
+   --  hidden, for example when the parent is a private type whose full
+   --  view is controlled. For other primitive operations we modify the
+   --  name of the operation to indicate that it is not overriding, but
+   --  this is not possible for Initialize, etc. because they have to be
+   --  retrievable by name. Before generating the proper call to one of
+   --  these operations we check whether Typ is known to be controlled at
+   --  the point of definition. If it is not then we must retrieve the
+   --  hidden operation of the parent and use it instead.  This is one
+   --  case that might be solved more cleanly once Overriding pragmas or
+   --  declarations are in place.
+
    function Convert_View
      (Proc : Entity_Id;
       Arg  : Node_Id;
@@ -244,7 +263,7 @@ package body Exp_Ch7 is
    --  component is itself controlled and is attached to the upper-level
    --  finalization chain. Its adjust primitive is in charge of calling
    --  adjust on the components and adusting the finalization pointer to
-   --  match their new location (see a-finali.adb)
+   --  match their new location (see a-finali.adb).
 
    --  It is not possible to use a similar technique for arrays that have
    --  Has_Controlled_Component set. In this case, deep procedures are
@@ -270,6 +289,19 @@ package body Exp_Ch7 is
    --  case (1) this is not important since we are exiting the scope
    --  anyway.
 
+   --  Other details:
+   --    - Type extensions will have a new record controller at each derivation
+   --      level containing controlled components.
+   --    - For types that are both Is_Controlled and Has_Controlled_Components,
+   --      the record controller and the object itself are handled separately.
+   --      It could seem simpler to attach the object at the end of its record
+   --      controller but this would not tackle view conversions properly.
+   --    - A classwide type can always potentially have controlled components
+   --      but the record controller of the corresponding actual type may not
+   --      be nown at compile time so the dispatch table contains a special
+   --      field that allows to compute the offset of the record controller
+   --      dynamically. See s-finimp.Deep_Tag_Attach and a-tags.RC_Offset
+
    --  Here is a simple example of the expansion of a controlled block :
 
    --    declare
@@ -299,8 +331,11 @@ package body Exp_Ch7 is
    --       end _Clean;
 
    --       X : Controlled;
-   --       Initialize (X);
-   --       Attach_To_Final_List (_L, Finalizable (X), 1);
+   --       begin
+   --          Abort_Defer;
+   --          Initialize (X);
+   --          Attach_To_Final_List (_L, Finalizable (X), 1);
+   --       at end: Abort_Undefer;
    --       Y : Controlled := Init;
    --       Adjust (Y);
    --       Attach_To_Final_List (_L, Finalizable (Y), 1);
@@ -310,17 +345,19 @@ package body Exp_Ch7 is
    --          C : Controlled;
    --       end record;
    --       W : R;
-   --       Deep_Initialize (W, _L, 1);
+   --       begin
+   --          Abort_Defer;
+   --          Deep_Initialize (W, _L, 1);
+   --       at end: Abort_Under;
    --       Z : R := (C => X);
    --       Deep_Adjust (Z, _L, 1);
 
    --    begin
-   --       Finalize (X);
-   --       X := Y;
-   --       Adjust (X);
-
+   --       _Assign (X, Y);
    --       Deep_Finalize (W, False);
+   --       <save W's final pointers>
    --       W := Z;
+   --       <restore W's final pointers>
    --       Deep_Adjust (W, _L, 0);
    --    at end
    --       _Clean;
@@ -332,6 +369,12 @@ package body Exp_Ch7 is
    --  objects, or any of the list controllers associated with library
    --  level access to controlled objects
 
+   procedure Clean_Simple_Protected_Objects (N : Node_Id);
+   --  Protected objects without entries are not controlled types, and the
+   --  locks have to be released explicitly when such an object goes out
+   --  of scope. Traverse declarations in scope to determine whether such
+   --  objects are present.
+
    ----------------------------
    -- Build_Array_Deep_Procs --
    ----------------------------
@@ -394,12 +437,11 @@ package body Exp_Ch7 is
             New_Reference_To
               (RTE (RE_List_Controller), Loc));
 
-      --  The type may have been frozen already, and this is a late
-      --  freezing action, in which case the declaration must be elaborated
-      --  at once. If the call is for an allocator, the chain must also be
-      --  created now, because the freezing of the type does not build one.
-      --  Otherwise, the declaration is one of the freezing actions for a
-      --  user-defined type.
+      --  The type may have been frozen already, and this is a late freezing
+      --  action, in which case the declaration must be elaborated at once.
+      --  If the call is for an allocator, the chain must also be created now,
+      --  because the freezing of the type does not build one. Otherwise, the
+      --  declaration is one of the freezing actions for a user-defined type.
 
       if Is_Frozen (Typ)
         or else (Nkind (N) = N_Allocator
@@ -455,6 +497,364 @@ package body Exp_Ch7 is
           Stmts => Make_Deep_Record_Body (Finalize_Case, Typ)));
    end Build_Record_Deep_Procs;
 
+   -------------------
+   -- Cleanup_Array --
+   -------------------
+
+   function Cleanup_Array
+     (N    : Node_Id;
+      Obj  : Node_Id;
+      Typ  : Entity_Id)
+      return List_Id
+   is
+      Loc        : constant Source_Ptr := Sloc (N);
+      Index_List : List_Id := New_List;
+
+      function Free_Component return List_Id;
+      --  Generate the code to finalize the task or protected  subcomponents
+      --  of a single component of the array.
+
+      function Free_One_Dimension (Dim : Int) return List_Id;
+      --  Generate a loop over one dimension of the array.
+
+      --------------------
+      -- Free_Component --
+      --------------------
+
+      function Free_Component return List_Id is
+         Stmts : List_Id := New_List;
+         Tsk   : Node_Id;
+         C_Typ : Entity_Id := Component_Type (Typ);
+
+      begin
+         --  Component type is known to contain tasks or protected objects
+
+         Tsk :=
+           Make_Indexed_Component (Loc,
+             Prefix        => Duplicate_Subexpr_No_Checks (Obj),
+             Expressions   => Index_List);
+
+         Set_Etype (Tsk, C_Typ);
+
+         if Is_Task_Type (C_Typ) then
+            Append_To (Stmts, Cleanup_Task (N, Tsk));
+
+         elsif Is_Simple_Protected_Type (C_Typ) then
+            Append_To (Stmts, Cleanup_Protected_Object (N, Tsk));
+
+         elsif Is_Record_Type (C_Typ) then
+            Stmts := Cleanup_Record (N, Tsk, C_Typ);
+
+         elsif Is_Array_Type (C_Typ) then
+            Stmts := Cleanup_Array (N, Tsk, C_Typ);
+         end if;
+
+         return Stmts;
+      end Free_Component;
+
+      ------------------------
+      -- Free_One_Dimension --
+      ------------------------
+
+      function Free_One_Dimension (Dim : Int) return List_Id is
+         Index      : Entity_Id;
+
+      begin
+         if Dim > Number_Dimensions (Typ) then
+            return Free_Component;
+
+         --  Here we generate the required loop
+
+         else
+            Index :=
+              Make_Defining_Identifier (Loc, New_Internal_Name ('J'));
+
+            Append (New_Reference_To (Index, Loc), Index_List);
+
+            return New_List (
+              Make_Implicit_Loop_Statement (N,
+                Identifier => Empty,
+                Iteration_Scheme =>
+                  Make_Iteration_Scheme (Loc,
+                    Loop_Parameter_Specification =>
+                      Make_Loop_Parameter_Specification (Loc,
+                        Defining_Identifier => Index,
+                        Discrete_Subtype_Definition =>
+                          Make_Attribute_Reference (Loc,
+                            Prefix => Duplicate_Subexpr (Obj),
+                            Attribute_Name  => Name_Range,
+                            Expressions => New_List (
+                              Make_Integer_Literal (Loc, Dim))))),
+                Statements =>  Free_One_Dimension (Dim + 1)));
+         end if;
+      end Free_One_Dimension;
+
+   --  Start of processing for Cleanup_Array
+
+   begin
+      return Free_One_Dimension (1);
+   end Cleanup_Array;
+
+   --------------------
+   -- Cleanup_Record --
+   --------------------
+
+   function Cleanup_Record
+     (N    : Node_Id;
+      Obj  : Node_Id;
+      Typ  : Entity_Id)
+      return List_Id
+   is
+      Loc   : constant Source_Ptr := Sloc (N);
+      Tsk   : Node_Id;
+      Comp  : Entity_Id;
+      Stmts : List_Id := New_List;
+      U_Typ : constant Entity_Id := Underlying_Type (Typ);
+
+   begin
+      if Has_Discriminants (U_Typ)
+        and then Nkind (Parent (U_Typ)) = N_Full_Type_Declaration
+        and then
+          Nkind (Type_Definition (Parent (U_Typ))) = N_Record_Definition
+        and then
+          Present
+            (Variant_Part
+              (Component_List (Type_Definition (Parent (U_Typ)))))
+      then
+         --  For now, do not attempt to free a component that may appear in
+         --  a variant, and instead issue a warning. Doing this "properly"
+         --  would require building a case statement and would be quite a
+         --  mess. Note that the RM only requires that free "work" for the
+         --  case of a task access value, so already we go way beyond this
+         --  in that we deal with the array case and non-discriminated
+         --  record cases.
+
+         Error_Msg_N
+           ("task/protected object in variant record will not be freed?", N);
+         return New_List (Make_Null_Statement (Loc));
+      end if;
+
+      Comp := First_Component (Typ);
+
+      while Present (Comp) loop
+         if Has_Task (Etype (Comp))
+           or else Has_Simple_Protected_Object (Etype (Comp))
+         then
+            Tsk :=
+              Make_Selected_Component (Loc,
+                Prefix        => Duplicate_Subexpr_No_Checks (Obj),
+                Selector_Name => New_Occurrence_Of (Comp, Loc));
+            Set_Etype (Tsk, Etype (Comp));
+
+            if Is_Task_Type (Etype (Comp)) then
+               Append_To (Stmts, Cleanup_Task (N, Tsk));
+
+            elsif Is_Simple_Protected_Type (Etype (Comp)) then
+               Append_To (Stmts, Cleanup_Protected_Object (N, Tsk));
+
+            elsif Is_Record_Type (Etype (Comp)) then
+
+               --  Recurse, by generating the prefix of the argument to
+               --  the eventual cleanup call.
+
+               Append_List_To
+                 (Stmts, Cleanup_Record (N, Tsk, Etype (Comp)));
+
+            elsif Is_Array_Type (Etype (Comp)) then
+               Append_List_To
+                 (Stmts, Cleanup_Array (N, Tsk, Etype (Comp)));
+            end if;
+         end if;
+
+         Next_Component (Comp);
+      end loop;
+
+      return Stmts;
+   end Cleanup_Record;
+
+   -------------------------------
+   --  Cleanup_Protected_Object --
+   -------------------------------
+
+   function Cleanup_Protected_Object
+     (N    : Node_Id;
+      Ref  : Node_Id)
+      return Node_Id
+   is
+      Loc : constant Source_Ptr := Sloc (N);
+
+   begin
+      return
+        Make_Procedure_Call_Statement (Loc,
+          Name => New_Reference_To (RTE (RE_Finalize_Protection), Loc),
+          Parameter_Associations => New_List (
+            Concurrent_Ref (Ref)));
+   end Cleanup_Protected_Object;
+
+   ------------------------------------
+   -- Clean_Simple_Protected_Objects --
+   ------------------------------------
+
+   procedure Clean_Simple_Protected_Objects (N : Node_Id) is
+      E     : Entity_Id;
+      Stmts : List_Id := Statements (Handled_Statement_Sequence (N));
+      Stmt  : Node_Id := Last (Stmts);
+
+   begin
+      E := First_Entity (Current_Scope);
+
+      while Present (E) loop
+         if (Ekind (E) = E_Variable
+              or else Ekind (E) = E_Constant)
+           and then Has_Simple_Protected_Object (Etype (E))
+           and then not Has_Task (Etype (E))
+         then
+            declare
+               Typ : constant Entity_Id := Etype (E);
+               Ref : constant Node_Id := New_Occurrence_Of (E, Sloc (Stmt));
+
+            begin
+               if Is_Simple_Protected_Type (Typ) then
+                  Append_To (Stmts, Cleanup_Protected_Object (N, Ref));
+
+               elsif Has_Simple_Protected_Object (Typ) then
+                  if Is_Record_Type (Typ) then
+                     Append_List_To (Stmts, Cleanup_Record (N, Ref, Typ));
+
+                  elsif Is_Array_Type (Typ) then
+                     Append_List_To (Stmts, Cleanup_Array (N, Ref, Typ));
+                  end if;
+               end if;
+            end;
+         end if;
+
+         Next_Entity (E);
+      end loop;
+
+      --   Analyze inserted cleanup statements.
+
+      if Present (Stmt) then
+         Stmt := Next (Stmt);
+
+         while Present (Stmt) loop
+            Analyze (Stmt);
+            Next (Stmt);
+         end loop;
+      end if;
+   end Clean_Simple_Protected_Objects;
+
+   ------------------
+   -- Cleanup_Task --
+   ------------------
+
+   function Cleanup_Task
+     (N    : Node_Id;
+      Ref  : Node_Id)
+      return Node_Id
+   is
+      Loc  : constant Source_Ptr := Sloc (N);
+   begin
+      return
+        Make_Procedure_Call_Statement (Loc,
+          Name => New_Reference_To (RTE (RE_Free_Task), Loc),
+          Parameter_Associations =>
+            New_List (Concurrent_Ref (Ref)));
+   end Cleanup_Task;
+
+   ---------------------------------
+   -- Has_Simple_Protected_Object --
+   ---------------------------------
+
+   function Has_Simple_Protected_Object (T : Entity_Id) return Boolean is
+      Comp : Entity_Id;
+
+   begin
+      if Is_Simple_Protected_Type (T) then
+         return True;
+
+      elsif Is_Array_Type (T) then
+         return Has_Simple_Protected_Object (Component_Type (T));
+
+      elsif Is_Record_Type (T) then
+         Comp := First_Component (T);
+
+         while Present (Comp) loop
+            if Has_Simple_Protected_Object (Etype (Comp)) then
+               return True;
+            end if;
+
+            Next_Component (Comp);
+         end loop;
+
+         return False;
+
+      else
+         return False;
+      end if;
+   end Has_Simple_Protected_Object;
+
+   ------------------------------
+   -- Is_Simple_Protected_Type --
+   ------------------------------
+
+   function Is_Simple_Protected_Type (T : Entity_Id) return Boolean is
+   begin
+      return Is_Protected_Type (T) and then not Has_Entries (T);
+   end Is_Simple_Protected_Type;
+
+   ------------------------------
+   -- Check_Visibly_Controlled --
+   ------------------------------
+
+   procedure Check_Visibly_Controlled
+     (Prim : Final_Primitives;
+      Typ  : Entity_Id;
+      E    : in out Entity_Id;
+      Cref : in out Node_Id)
+   is
+      Parent_Type : Entity_Id;
+      Op          : Entity_Id;
+
+   begin
+      if Is_Derived_Type (Typ)
+        and then Comes_From_Source (E)
+        and then Is_Overriding_Operation (E)
+        and then
+          (not Is_Predefined_File_Name
+                     (Unit_File_Name (Get_Source_Unit (Root_Type (Typ)))))
+      then
+         --  We know that the explicit operation on the type overrode
+         --  the inherited operation of the parent, and that the derivation
+         --  is from a private type that is not visibly controlled.
+
+         Parent_Type := Etype (Typ);
+         Op := Find_Prim_Op (Parent_Type, Name_Of (Prim));
+
+         if Present (Op)
+            and then Is_Hidden (Op)
+            and then Scope (Scope (Typ)) /= Scope (Op)
+            and then not In_Open_Scopes (Scope (Typ))
+         then
+            --  If the parent operation is not visible, and the derived
+            --  type is not declared in a child unit, then the explicit
+            --  operation does not override, and we must use the operation
+            --  of the parent.
+
+            E := Op;
+
+            --  Wrap the object to be initialized into the proper
+            --  unchecked conversion, to be compatible with the operation
+            --  to be called.
+
+            if Nkind (Cref) = N_Unchecked_Type_Conversion then
+               Cref := Unchecked_Convert_To (Parent_Type, Expression (Cref));
+            else
+               Cref := Unchecked_Convert_To (Parent_Type, Cref);
+            end if;
+         end if;
+      end if;
+   end Check_Visibly_Controlled;
+
    ---------------------
    -- Controlled_Type --
    ---------------------
@@ -511,9 +911,11 @@ package body Exp_Ch7 is
       --  Class-wide types must be treated as controlled because they may
       --  contain an extension that has controlled components
 
+      --  We can skip this if finalization is not available
+
       return (Is_Class_Wide_Type (T)
-                and then not No_Run_Time
-                and then not In_Finalization_Root (T))
+                and then not In_Finalization_Root (T)
+                and then not Restrictions (No_Finalization))
         or else Is_Controlled (T)
         or else Has_Some_Controlled_Component (T)
         or else (Is_Concurrent_Type (T)
@@ -720,7 +1122,7 @@ package body Exp_Ch7 is
 
       Clean     : Entity_Id;
       Mark      : Entity_Id := Empty;
-      New_Decls : List_Id   := New_List;
+      New_Decls : constant List_Id := New_List;
       Blok      : Node_Id;
       Wrapped   : Boolean;
       Chain     : Entity_Id := Empty;
@@ -759,6 +1161,19 @@ package body Exp_Ch7 is
         and then not Is_Task_Allocation
         and then not Is_Asynchronous_Call
       then
+         Clean_Simple_Protected_Objects (N);
+         return;
+      end if;
+
+      --  If the current scope is the subprogram body that is the rewriting
+      --  of a task body, and the descriptors have not been delayed (due to
+      --  some nested instantiations) do not generate redundant cleanup
+      --  actions: the cleanup procedure already exists for this body.
+
+      if Nkind (N) = N_Subprogram_Body
+        and then Nkind (Original_Node (N)) = N_Task_Body
+        and then not Delay_Subprogram_Descriptors (Corresponding_Spec (N))
+      then
          return;
       end if;
 
@@ -941,11 +1356,12 @@ package body Exp_Ch7 is
    -------------------------------
 
    procedure Expand_Ctrl_Function_Call (N : Node_Id) is
-      Loc    : constant Source_Ptr := Sloc (N);
-      Rtype  : constant Entity_Id  := Etype (N);
-      Utype  : constant Entity_Id  := Underlying_Type (Rtype);
-      Ref    : Node_Id;
-      Action : Node_Id;
+      Loc     : constant Source_Ptr := Sloc (N);
+      Rtype   : constant Entity_Id  := Etype (N);
+      Utype   : constant Entity_Id  := Underlying_Type (Rtype);
+      Ref     : Node_Id;
+      Action  : Node_Id;
+      Action2 : Node_Id := Empty;
 
       Attach_Level : Uint    := Uint_1;
       Len_Ref      : Node_Id := Empty;
@@ -957,25 +1373,25 @@ package body Exp_Ch7 is
       --  Creates a reference to the last component of the array object
       --  designated by Ref whose type is Typ.
 
+      --------------------------
+      -- Last_Array_Component --
+      --------------------------
+
       function Last_Array_Component
         (Ref :  Node_Id;
          Typ :  Entity_Id)
          return Node_Id
       is
-         N          : Int;
-         Index_List : List_Id := New_List;
+         Index_List : constant List_Id := New_List;
 
       begin
-         N := 1;
-         while N <= Number_Dimensions (Typ) loop
+         for N in 1 .. Number_Dimensions (Typ) loop
             Append_To (Index_List,
               Make_Attribute_Reference (Loc,
-                Prefix         => Duplicate_Subexpr (Ref),
+                Prefix         => Duplicate_Subexpr_No_Checks (Ref),
                 Attribute_Name => Name_Last,
                 Expressions    => New_List (
                   Make_Integer_Literal (Loc, N))));
-
-            N := N + 1;
          end loop;
 
          return
@@ -1000,21 +1416,34 @@ package body Exp_Ch7 is
       --  because of the duplication
 
       Set_Analyzed (N);
-      Ref := Duplicate_Subexpr (N);
+      Ref := Duplicate_Subexpr_No_Checks (N);
 
       --  Now we can generate the Attach Call, note that this value is
       --  always in the (secondary) stack and thus is attached to a singly
       --  linked final list:
-      --
+
       --    Resx := F (X)'reference;
       --    Attach_To_Final_List (_Lx, Resx.all, 1);
+
       --  or when there are controlled components
+
+      --    Attach_To_Final_List (_Lx, Resx._controller, 1);
+
+      --  or when it is both is_controlled and has_controlled_components
+
       --    Attach_To_Final_List (_Lx, Resx._controller, 1);
-      --  or if it is an array with is_controlled components
+      --    Attach_To_Final_List (_Lx, Resx, 1);
+
+      --  or if it is an array with is_controlled (and has_controlled)
+
       --    Attach_To_Final_List (_Lx, Resx (Resx'last), 3);
       --    An attach level of 3 means that a whole array is to be
-      --    attached to the finalization list
-      --  or if it is an array with has_controlled components
+      --    attached to the finalization list (including the controlled
+      --    components)
+
+      --  or if it is an array with has_controlled components but not
+      --  is_controlled
+
       --    Attach_To_Final_List (_Lx, Resx (Resx'last)._controller, 3);
 
       if Has_Controlled_Component (Rtype) then
@@ -1026,7 +1455,9 @@ package body Exp_Ch7 is
             if Is_Array_Type (T2) then
                Len_Ref :=
                  Make_Attribute_Reference (Loc,
-                 Prefix => Duplicate_Subexpr (Unchecked_Convert_To (T2, Ref)),
+                 Prefix =>
+                   Duplicate_Subexpr_Move_Checks
+                     (Unchecked_Convert_To (T2, Ref)),
                  Attribute_Name => Name_Length);
             end if;
 
@@ -1034,16 +1465,26 @@ package body Exp_Ch7 is
                if T1 /= T2 then
                   Ref := Unchecked_Convert_To (T2, Ref);
                end if;
+
                Ref := Last_Array_Component (Ref, T2);
                Attach_Level := Uint_3;
                T1 := Component_Type (T2);
                T2 := Underlying_Type (T1);
             end loop;
 
-            if Has_Controlled_Component (T2) then
+            --  If the type has controlled components, go to the controller
+            --  except in the case of arrays of controlled objects since in
+            --  this case objects and their components are already chained
+            --  and the head of the chain is the last array element.
+
+            if Is_Array_Type (Rtype) and then Is_Controlled (T2) then
+               null;
+
+            elsif Has_Controlled_Component (T2) then
                if T1 /= T2 then
                   Ref := Unchecked_Convert_To (T2, Ref);
                end if;
+
                Ref :=
                  Make_Selected_Component (Loc,
                    Prefix        => Ref,
@@ -1060,6 +1501,16 @@ package body Exp_Ch7 is
              Flist_Ref    => Find_Final_List (Current_Scope),
              With_Attach  => Make_Integer_Literal (Loc, Attach_Level));
 
+         --  If it is also Is_Controlled we need to attach the global object
+
+         if Is_Controlled (Rtype) then
+            Action2 :=
+              Make_Attach_Call (
+                Obj_Ref      => Duplicate_Subexpr_No_Checks (N),
+                Flist_Ref    => Find_Final_List (Current_Scope),
+                With_Attach  => Make_Integer_Literal (Loc, Attach_Level));
+         end if;
+
       else
          --  Here, we have a controlled type that does not seem to have
          --  controlled components but it could be a class wide type whose
@@ -1092,6 +1543,9 @@ package body Exp_Ch7 is
       end if;
 
       Insert_Action (N, Action);
+      if Present (Action2) then
+         Insert_Action (N, Action2);
+      end if;
    end Expand_Ctrl_Function_Call;
 
    ---------------------------
@@ -1106,7 +1560,7 @@ package body Exp_Ch7 is
    --  ENcode entity names in package body
 
    procedure Expand_N_Package_Body (N : Node_Id) is
-      Ent : Entity_Id := Corresponding_Spec (N);
+      Ent : constant Entity_Id := Corresponding_Spec (N);
 
    begin
       --  This is done only for non-generic packages
@@ -1550,6 +2004,15 @@ package body Exp_Ch7 is
          Cref := Unchecked_Convert_To (Utyp, Cref);
       end if;
 
+      --  If the object is unanalyzed, set its expected type for use
+      --  in Convert_View in case an additional conversion is needed.
+
+      if No (Etype (Cref))
+        and then Nkind (Cref) /= N_Unchecked_Type_Conversion
+      then
+         Set_Etype (Cref, Typ);
+      end if;
+
       --  We do not need to attach to one of the Global Final Lists
       --  the objects whose type is Finalize_Storage_Only
 
@@ -1568,10 +2031,10 @@ package body Exp_Ch7 is
         or else Is_Class_Wide_Type (Typ)
       then
          if Is_Tagged_Type (Utyp) then
-            Proc := Find_Prim_Op (Utyp, Deep_Name_Of (Adjust_Case));
+            Proc := Find_Prim_Op (Utyp, TSS_Deep_Adjust);
 
          else
-            Proc := TSS (Utyp, Deep_Name_Of (Adjust_Case));
+            Proc := TSS (Utyp, TSS_Deep_Adjust);
          end if;
 
          Cref := Convert_View (Proc, Cref, 2);
@@ -1600,14 +2063,6 @@ package body Exp_Ch7 is
            Parameter_Associations => New_List (Cref2)));
 
          Append_To (Res, Make_Attach_Call (Cref, Flist_Ref, Attach));
-
-         --  Treat this as a reference to Adjust if the Adjust routine
-         --  comes from source. The call is not explicit, but it is near
-         --  enough, and we won't typically get explicit adjust calls.
-
-         if Comes_From_Source (Proc) then
-            Generate_Reference (Proc, Ref);
-         end if;
       end if;
 
       return Res;
@@ -1663,9 +2118,9 @@ package body Exp_Ch7 is
       Is_Asynchronous_Call_Block : Boolean)
       return      Node_Id
    is
-      Loc : constant Source_Ptr := Sloc (Clean);
+      Loc  : constant Source_Ptr := Sloc (Clean);
+      Stmt : constant List_Id    := New_List;
 
-      Stmt         : List_Id := New_List;
       Sbody        : Node_Id;
       Spec         : Node_Id;
       Name         : Node_Id;
@@ -1766,7 +2221,7 @@ package body Exp_Ch7 is
 
          if Has_Entries (Pid)
            or else Has_Interrupt_Handler (Pid)
-           or else Has_Attach_Handler (Pid)
+           or else (Has_Attach_Handler (Pid) and then not Restricted_Profile)
          then
             if Abort_Allowed
               or else Restrictions (No_Entry_Queue) = False
@@ -2083,7 +2538,6 @@ package body Exp_Ch7 is
       Formals   : List_Id;
       Proc_Name : Entity_Id;
       Handler   : List_Id := No_List;
-      Subp_Body : Node_Id;
       Type_B    : Entity_Id;
 
    begin
@@ -2104,7 +2558,7 @@ package body Exp_Ch7 is
 
       Append_To (Formals,
         Make_Parameter_Specification (Loc,
-           Defining_Identifier => Make_Defining_Identifier (Loc, Name_V),
+          Defining_Identifier => Make_Defining_Identifier (Loc, Name_V),
           In_Present          => True,
           Out_Present         => True,
           Parameter_Type      => New_Reference_To (Typ, Loc)));
@@ -2123,9 +2577,11 @@ package body Exp_Ch7 is
                  Reason => PE_Finalize_Raised_Exception))));
       end if;
 
-      Proc_Name := Make_Defining_Identifier (Loc, Deep_Name_Of (Prim));
+      Proc_Name :=
+        Make_Defining_Identifier (Loc,
+          Chars => Make_TSS_Name (Typ, Deep_Name_Of (Prim)));
 
-      Subp_Body :=
+      Discard_Node (
         Make_Subprogram_Body (Loc,
           Specification =>
             Make_Procedure_Specification (Loc,
@@ -2136,7 +2592,7 @@ package body Exp_Ch7 is
           Handled_Statement_Sequence =>
             Make_Handled_Sequence_Of_Statements (Loc,
               Statements         => Stmts,
-              Exception_Handlers => Handler));
+              Exception_Handlers => Handler)));
 
       return Proc_Name;
    end Make_Deep_Proc;
@@ -2162,6 +2618,7 @@ package body Exp_Ch7 is
                            Prefix        => Obj_Ref,
                            Selector_Name =>
                              Make_Identifier (Loc, Name_uController));
+      Res            : constant List_Id := New_List;
 
    begin
       if Is_Return_By_Reference_Type (Typ) then
@@ -2172,53 +2629,78 @@ package body Exp_Ch7 is
 
       case Prim is
          when Initialize_Case =>
-            declare
-               Res  : constant List_Id := New_List;
-
-            begin
-               Append_List_To (Res,
-                 Make_Init_Call (
-                   Ref          => Controller_Ref,
-                   Typ          => Controller_Typ,
-                   Flist_Ref    => Make_Identifier (Loc, Name_L),
-                   With_Attach  => Make_Identifier (Loc, Name_B)));
-
-               --  When the type is also a controlled type by itself,
-               --  Initialize it and attach it at the end of the internal
-               --  finalization chain
-
-               if Is_Controlled (Typ) then
-                  Append_To (Res,
-                    Make_Procedure_Call_Statement (Loc,
-                      Name => New_Reference_To (
-                        Find_Prim_Op (Typ, Name_Of (Prim)), Loc),
-
-                      Parameter_Associations =>
-                        New_List (New_Copy_Tree (Obj_Ref))));
-
-                  Append_To (Res, Make_Attach_Call (
-                    Obj_Ref      => New_Copy_Tree (Obj_Ref),
-                    Flist_Ref    =>
-                      Make_Selected_Component (Loc,
-                        Prefix        => New_Copy_Tree (Controller_Ref),
-                        Selector_Name => Make_Identifier (Loc, Name_F)),
-                    With_Attach => Make_Integer_Literal (Loc, 1)));
-               end if;
-
-               return Res;
-            end;
+            Append_List_To (Res,
+              Make_Init_Call (
+                Ref          => Controller_Ref,
+                Typ          => Controller_Typ,
+                Flist_Ref    => Make_Identifier (Loc, Name_L),
+                With_Attach  => Make_Identifier (Loc, Name_B)));
+
+            --  When the type is also a controlled type by itself,
+            --  Initialize it and attach it to the finalization chain
+
+            if Is_Controlled (Typ) then
+               Append_To (Res,
+                 Make_Procedure_Call_Statement (Loc,
+                   Name => New_Reference_To (
+                     Find_Prim_Op (Typ, Name_Of (Prim)), Loc),
+                   Parameter_Associations =>
+                     New_List (New_Copy_Tree (Obj_Ref))));
+
+               Append_To (Res, Make_Attach_Call (
+                 Obj_Ref      => New_Copy_Tree (Obj_Ref),
+                 Flist_Ref    => Make_Identifier (Loc, Name_L),
+                 With_Attach => Make_Identifier (Loc, Name_B)));
+            end if;
 
          when Adjust_Case =>
-            return
+            Append_List_To (Res,
               Make_Adjust_Call (Controller_Ref, Controller_Typ,
                 Make_Identifier (Loc, Name_L),
-                Make_Identifier (Loc, Name_B));
+                Make_Identifier (Loc, Name_B)));
+
+            --  When the type is also a controlled type by itself,
+            --  Adjust it it and attach it to the finalization chain
+
+            if Is_Controlled (Typ) then
+               Append_To (Res,
+                 Make_Procedure_Call_Statement (Loc,
+                   Name => New_Reference_To (
+                     Find_Prim_Op (Typ, Name_Of (Prim)), Loc),
+                   Parameter_Associations =>
+                     New_List (New_Copy_Tree (Obj_Ref))));
+
+               Append_To (Res, Make_Attach_Call (
+                 Obj_Ref      => New_Copy_Tree (Obj_Ref),
+                 Flist_Ref    => Make_Identifier (Loc, Name_L),
+                 With_Attach => Make_Identifier (Loc, Name_B)));
+            end if;
 
          when Finalize_Case =>
-            return
+            if Is_Controlled (Typ) then
+               Append_To (Res,
+                 Make_Implicit_If_Statement (Obj_Ref,
+                   Condition => Make_Identifier (Loc, Name_B),
+                   Then_Statements => New_List (
+                     Make_Procedure_Call_Statement (Loc,
+                       Name => New_Reference_To (RTE (RE_Finalize_One), Loc),
+                       Parameter_Associations => New_List (
+                         OK_Convert_To (RTE (RE_Finalizable),
+                           New_Copy_Tree (Obj_Ref))))),
+
+                   Else_Statements => New_List (
+                     Make_Procedure_Call_Statement (Loc,
+                       Name => New_Reference_To (
+                         Find_Prim_Op (Typ, Name_Of (Prim)), Loc),
+                       Parameter_Associations =>
+                        New_List (New_Copy_Tree (Obj_Ref))))));
+            end if;
+
+            Append_List_To (Res,
               Make_Final_Call (Controller_Ref, Controller_Typ,
-                Make_Identifier (Loc, Name_B));
+                Make_Identifier (Loc, Name_B)));
       end case;
+      return Res;
    end Make_Deep_Record_Body;
 
    ----------------------
@@ -2287,9 +2769,9 @@ package body Exp_Ch7 is
         or else Is_Class_Wide_Type (Typ)
       then
          if Is_Tagged_Type (Utyp) then
-            Proc := Find_Prim_Op (Utyp, Deep_Name_Of (Finalize_Case));
+            Proc := Find_Prim_Op (Utyp, TSS_Deep_Finalize);
          else
-            Proc := TSS (Utyp, Deep_Name_Of (Finalize_Case));
+            Proc := TSS (Utyp, TSS_Deep_Finalize);
          end if;
 
          Cref := Convert_View (Proc, Cref);
@@ -2343,13 +2825,6 @@ package body Exp_Ch7 is
          end if;
       end if;
 
-         --  Treat this as a reference to Finalize if the Finalize routine
-         --  comes from source. The call is not explicit, but it is near
-         --  enough, and we won't typically get explicit adjust calls.
-
-         if Comes_From_Source (Proc) then
-            Generate_Reference (Proc, Ref);
-         end if;
       return Res;
    end Make_Final_Call;
 
@@ -2451,6 +2926,8 @@ package body Exp_Ch7 is
 
       else -- Is_Controlled (Utyp)
          Proc  := Find_Prim_Op (Utyp, Name_Of (Initialize_Case));
+         Check_Visibly_Controlled (Initialize_Case, Typ, Proc, Cref);
+
          Cref  := Convert_View (Proc, Cref);
          Cref2 := New_Copy_Tree (Cref);
 
@@ -2461,14 +2938,6 @@ package body Exp_Ch7 is
 
          Append_To (Res,
            Make_Attach_Call (Cref, Flist_Ref, Attach));
-
-         --  Treat this as a reference to Initialize if Initialize routine
-         --  comes from source. The call is not explicit, but it is near
-         --  enough, and we won't typically get explicit adjust calls.
-
-         if Comes_From_Source (Proc) then
-            Generate_Reference (Proc, Ref);
-         end if;
       end if;
 
       return Res;
@@ -2822,7 +3291,7 @@ package body Exp_Ch7 is
       Loc  : constant Source_Ptr := Sloc (N);
       E    : constant Entity_Id :=
                Make_Defining_Identifier (Loc, New_Internal_Name ('E'));
-      Etyp : Entity_Id := Etype (N);
+      Etyp : constant Entity_Id := Etype (N);
 
    begin
       Insert_Actions (N, New_List (