From: Eric Botcazou <[email protected]>
The -gnatwu switch does not give any warning for a unused use clause when a
use clause for a child package is present. It turns out that there are many
occurrences in the compiler itself!
gcc/ada/ChangeLog:
PR ada/123003
* accessibility.adb: Remove unused clauses.
* aspects.adb: Likewise.
* checks.adb: Likewise.
* comperr.adb: Likewise.
* contracts.adb: Likewise.
* cstand.adb: Likewise.
* debug_a.adb: Likewise.
* errout.adb: Likewise.
* eval_fat.adb: Likewise.
* exp_aggr.adb: Likewise.
* exp_atag.adb: Likewise.
* exp_attr.adb: Likewise.
* exp_cg.adb: Likewise.
* exp_ch11.adb: Likewise.
* exp_ch12.adb: Likewise.
* exp_ch13.adb: Likewise.
* exp_ch2.adb: Likewise.
* exp_ch3.adb: Likewise.
* exp_ch4.adb: Likewise.
* exp_ch5.adb: Likewise.
* exp_ch6.adb: Likewise.
* exp_ch7.adb: Likewise.
* exp_ch8.adb: Likewise.
* exp_ch9.adb: Likewise.
* exp_code.adb: Likewise.
* exp_dbug.adb: Likewise.
* exp_disp.adb: Likewise.
* exp_dist.adb: Likewise.
* exp_fixd.adb: Likewise.
* exp_imgv.adb: Likewise.
* exp_intr.adb: Likewise.
* exp_pakd.adb: Likewise.
* exp_prag.adb: Likewise.
* exp_put_image.adb: Likewise.
* exp_sel.adb: Likewise.
* exp_smem.adb: Likewise.
* exp_spark.adb: Likewise.
* exp_strm.adb: Likewise.
* exp_tss.adb: Likewise.
* exp_unst.adb: Likewise.
* exp_util.adb: Likewise.
* exp_util.ads: Likewise.
* expander.adb: Likewise.
* freeze.adb: Likewise.
* frontend.adb: Likewise.
* ghost.adb: Likewise.
* gnat1drv.adb: Likewise.
* gnat_cuda.adb: Likewise.
* impunit.adb: Likewise.
* inline.adb: Likewise.
* itypes.adb: Likewise.
* itypes.ads: Likewise.
* layout.adb: Likewise.
* lib.adb: Likewise.
* libgnarl/s-tasuti.adb: Likewise.
* live.adb: Likewise.
* local_restrict.adb: Likewise.
* mutably_tagged.adb: Likewise.
* nlists.adb: Likewise.
* par.adb: Likewise.
* par_sco.adb: Likewise.
* pprint.adb: Likewise.
* repinfo.adb: Likewise.
* restrict.adb: Likewise.
* rtsfind.adb: Likewise.
* scil_ll.adb: Likewise.
* scn.adb: Likewise.
* sem.adb: Likewise.
* sem_aggr.adb: Likewise.
* sem_attr.adb: Likewise.
* sem_aux.adb: Likewise.
* sem_case.adb: Likewise.
* sem_cat.adb: Likewise.
* sem_ch10.adb: Likewise.
* sem_ch11.adb: Likewise.
* sem_ch12.adb: Likewise.
* sem_ch13.adb: Likewise.
* sem_ch2.adb: Likewise.
* sem_ch3.adb: Likewise.
* sem_ch4.adb: Likewise.
* sem_ch5.adb: Likewise.
* sem_ch6.adb: Likewise.
* sem_ch7.adb: Likewise.
* sem_ch9.adb: Likewise.
* sem_dim.adb: Likewise.
* sem_disp.adb: Likewise.
* sem_dist.adb: Likewise.
* sem_elab.adb: Likewise.
* sem_elim.adb: Likewise.
* sem_eval.adb: Likewise.
* sem_intr.adb: Likewise.
* sem_mech.adb: Likewise.
* sem_prag.adb: Likewise.
* sem_res.adb: Likewise.
* sem_scil.adb: Likewise.
* sem_smem.adb: Likewise.
* sem_type.adb: Likewise.
* sem_util.adb: Likewise.
* sem_util.ads: Likewise.
* sem_warn.adb: Likewise.
* sinput.adb: Likewise.
* sprint.adb: Likewise.
* strub.adb: Likewise.
* style.adb: Likewise.
* styleg.adb: Likewise.
* tbuild.adb: Likewise.
* tbuild.ads: Likewise.
* treepr.adb: Likewise.
* uname.adb: Likewise.
* sem_ch8.adb: Likewise.
(Mark_Use_Clauses.Mark_Use_Package): Do not recurse on the prefix
for a package given by an expanded name.
Tested on x86_64-pc-linux-gnu (before the recent bootstrap breakage), committed
on master.
---
gcc/ada/accessibility.adb | 2 --
gcc/ada/aspects.adb | 2 --
gcc/ada/checks.adb | 2 --
gcc/ada/comperr.adb | 1 -
gcc/ada/contracts.adb | 2 --
gcc/ada/cstand.adb | 2 --
gcc/ada/debug_a.adb | 1 -
gcc/ada/errout.adb | 2 --
gcc/ada/eval_fat.adb | 1 -
gcc/ada/exp_aggr.adb | 2 --
gcc/ada/exp_atag.adb | 2 --
gcc/ada/exp_attr.adb | 2 --
gcc/ada/exp_cg.adb | 2 --
gcc/ada/exp_ch11.adb | 2 --
gcc/ada/exp_ch12.adb | 2 --
gcc/ada/exp_ch13.adb | 2 --
gcc/ada/exp_ch2.adb | 2 --
gcc/ada/exp_ch3.adb | 2 --
gcc/ada/exp_ch4.adb | 2 --
gcc/ada/exp_ch5.adb | 2 --
gcc/ada/exp_ch6.adb | 2 --
gcc/ada/exp_ch7.adb | 2 --
gcc/ada/exp_ch8.adb | 2 --
gcc/ada/exp_ch9.adb | 2 --
gcc/ada/exp_code.adb | 2 --
gcc/ada/exp_dbug.adb | 2 --
gcc/ada/exp_disp.adb | 2 --
gcc/ada/exp_dist.adb | 2 --
gcc/ada/exp_fixd.adb | 2 --
gcc/ada/exp_imgv.adb | 2 --
gcc/ada/exp_intr.adb | 2 --
gcc/ada/exp_pakd.adb | 2 --
gcc/ada/exp_prag.adb | 2 --
gcc/ada/exp_put_image.adb | 2 --
gcc/ada/exp_sel.adb | 1 -
gcc/ada/exp_smem.adb | 2 --
gcc/ada/exp_spark.adb | 2 --
gcc/ada/exp_strm.adb | 2 --
gcc/ada/exp_tss.adb | 2 --
gcc/ada/exp_unst.adb | 2 --
gcc/ada/exp_util.adb | 1 -
gcc/ada/exp_util.ads | 1 -
gcc/ada/expander.adb | 1 -
gcc/ada/freeze.adb | 2 --
gcc/ada/frontend.adb | 1 -
gcc/ada/ghost.adb | 2 --
gcc/ada/gnat1drv.adb | 2 --
gcc/ada/gnat_cuda.adb | 1 -
gcc/ada/impunit.adb | 1 -
gcc/ada/inline.adb | 3 ---
gcc/ada/itypes.adb | 1 -
gcc/ada/itypes.ads | 1 -
gcc/ada/layout.adb | 2 --
gcc/ada/lib.adb | 2 --
gcc/ada/libgnarl/s-tasuti.adb | 1 -
gcc/ada/live.adb | 2 --
gcc/ada/local_restrict.adb | 1 -
gcc/ada/mutably_tagged.adb | 2 --
gcc/ada/nlists.adb | 1 -
gcc/ada/par.adb | 2 --
gcc/ada/par_sco.adb | 1 -
gcc/ada/pprint.adb | 2 --
gcc/ada/repinfo.adb | 2 --
gcc/ada/restrict.adb | 2 --
gcc/ada/rtsfind.adb | 5 +----
gcc/ada/scil_ll.adb | 1 -
gcc/ada/scn.adb | 1 -
gcc/ada/sem.adb | 2 --
gcc/ada/sem_aggr.adb | 2 --
gcc/ada/sem_attr.adb | 2 --
gcc/ada/sem_aux.adb | 2 --
gcc/ada/sem_case.adb | 2 --
gcc/ada/sem_cat.adb | 2 --
gcc/ada/sem_ch10.adb | 3 ---
gcc/ada/sem_ch11.adb | 3 ---
gcc/ada/sem_ch12.adb | 3 ---
gcc/ada/sem_ch13.adb | 2 --
gcc/ada/sem_ch2.adb | 2 --
gcc/ada/sem_ch3.adb | 2 --
gcc/ada/sem_ch4.adb | 2 --
gcc/ada/sem_ch5.adb | 2 --
gcc/ada/sem_ch6.adb | 2 --
gcc/ada/sem_ch7.adb | 2 --
gcc/ada/sem_ch8.adb | 23 ++++++-----------------
gcc/ada/sem_ch9.adb | 2 --
gcc/ada/sem_dim.adb | 2 --
gcc/ada/sem_disp.adb | 2 --
gcc/ada/sem_dist.adb | 2 --
gcc/ada/sem_elab.adb | 2 --
gcc/ada/sem_elim.adb | 2 --
gcc/ada/sem_eval.adb | 2 --
gcc/ada/sem_intr.adb | 2 --
gcc/ada/sem_mech.adb | 2 --
gcc/ada/sem_prag.adb | 2 --
gcc/ada/sem_res.adb | 2 --
gcc/ada/sem_scil.adb | 2 --
gcc/ada/sem_smem.adb | 2 --
gcc/ada/sem_type.adb | 2 --
gcc/ada/sem_util.adb | 1 -
gcc/ada/sem_util.ads | 1 -
gcc/ada/sem_warn.adb | 2 --
gcc/ada/sinput.adb | 1 -
gcc/ada/sprint.adb | 2 --
gcc/ada/strub.adb | 2 --
gcc/ada/style.adb | 2 --
gcc/ada/styleg.adb | 1 -
gcc/ada/tbuild.adb | 1 -
gcc/ada/tbuild.ads | 1 -
gcc/ada/treepr.adb | 2 --
gcc/ada/uname.adb | 2 --
110 files changed, 7 insertions(+), 217 deletions(-)
diff --git a/gcc/ada/accessibility.adb b/gcc/ada/accessibility.adb
index c7800542dcc..220427a4651 100644
--- a/gcc/ada/accessibility.adb
+++ b/gcc/ada/accessibility.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Elists; use Elists;
with Errout; use Errout;
@@ -46,7 +45,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Ch8; use Sem_Ch8;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/aspects.adb b/gcc/ada/aspects.adb
index aecbbe27073..d0ec2d59b5b 100644
--- a/gcc/ada/aspects.adb
+++ b/gcc/ada/aspects.adb
@@ -25,11 +25,9 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Nlists; use Nlists;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb
index a943d009353..a346772001f 100644
--- a/gcc/ada/checks.adb
+++ b/gcc/ada/checks.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -56,7 +55,6 @@ with Sem_Mech; use Sem_Mech;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/comperr.adb b/gcc/ada/comperr.adb
index c6285e98620..3dd027eca0e 100644
--- a/gcc/ada/comperr.adb
+++ b/gcc/ada/comperr.adb
@@ -37,7 +37,6 @@ with Namet; use Namet;
with Opt; use Opt;
with Osint; use Osint;
with Output; use Output;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinput; use Sinput;
with Sprint; use Sprint;
diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb
index d8719993983..8aaf4112872 100644
--- a/gcc/ada/contracts.adb
+++ b/gcc/ada/contracts.adb
@@ -25,7 +25,6 @@
with Aspects; use Aspects;
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -50,7 +49,6 @@ with Sem_Disp; use Sem_Disp;
with Sem_Prag; use Sem_Prag;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/cstand.adb b/gcc/ada/cstand.adb
index 8dd169a0dba..8fdecf8f01e 100644
--- a/gcc/ada/cstand.adb
+++ b/gcc/ada/cstand.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Csets; use Csets;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -43,7 +42,6 @@ with Ttypes; use Ttypes;
with Sem_Mech; use Sem_Mech;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/debug_a.adb b/gcc/ada/debug_a.adb
index 8d68fc8eff7..b4f294ae9cf 100644
--- a/gcc/ada/debug_a.adb
+++ b/gcc/ada/debug_a.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Debug; use Debug;
with Namet; use Namet;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinput; use Sinput;
with Output; use Output;
diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb
index 220523c1690..e6d0dbcd2ab 100644
--- a/gcc/ada/errout.adb
+++ b/gcc/ada/errout.adb
@@ -33,7 +33,6 @@ with Atree; use Atree;
with Casing; use Casing;
with Csets; use Csets;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Erroutc; use Erroutc;
@@ -48,7 +47,6 @@ with Output; use Output;
with Scans; use Scans;
with Sem_Aux; use Sem_Aux;
with Sinput; use Sinput;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/eval_fat.adb b/gcc/ada/eval_fat.adb
index 5a2e43ef597..67feb20064b 100644
--- a/gcc/ada/eval_fat.adb
+++ b/gcc/ada/eval_fat.adb
@@ -23,7 +23,6 @@
-- --
------------------------------------------------------------------------------
-with Einfo; use Einfo;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
with Opt; use Opt;
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index 24fd5b5f92a..afd741e75e5 100644
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -64,7 +63,6 @@ with Sem_Res; use Sem_Res;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
use Sem_Util.Storage_Model_Support;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_atag.adb b/gcc/ada/exp_atag.adb
index 917a17745e1..532b29e2adf 100644
--- a/gcc/ada/exp_atag.adb
+++ b/gcc/ada/exp_atag.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -34,7 +33,6 @@ with Nlists; use Nlists;
with Nmake; use Nmake;
with Opt; use Opt;
with Rtsfind; use Rtsfind;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sem_Aux; use Sem_Aux;
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 03cb02841fd..259c33859d1 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -27,7 +27,6 @@ with Accessibility; use Accessibility;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -62,7 +61,6 @@ with Sem_Ch8; use Sem_Ch8;
with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_cg.adb b/gcc/ada/exp_cg.adb
index 8aee5969582..7c16bc5fa5c 100644
--- a/gcc/ada/exp_cg.adb
+++ b/gcc/ada/exp_cg.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -38,7 +37,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Disp; use Sem_Disp;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_ch11.adb b/gcc/ada/exp_ch11.adb
index 71921787955..d9376568aeb 100644
--- a/gcc/ada/exp_ch11.adb
+++ b/gcc/ada/exp_ch11.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -43,7 +42,6 @@ with Rtsfind; use Rtsfind;
with Sem; use Sem;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_ch12.adb b/gcc/ada/exp_ch12.adb
index 1b1f3cfa557..6a894b83663 100644
--- a/gcc/ada/exp_ch12.adb
+++ b/gcc/ada/exp_ch12.adb
@@ -25,11 +25,9 @@
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Exp_Util; use Exp_Util;
with Nmake; use Nmake;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_ch13.adb b/gcc/ada/exp_ch13.adb
index e884375f99d..0fa3f400bfa 100644
--- a/gcc/ada/exp_ch13.adb
+++ b/gcc/ada/exp_ch13.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Ch3; use Exp_Ch3;
@@ -47,7 +46,6 @@ with Sem_Ch7; use Sem_Ch7;
with Sem_Ch8; use Sem_Ch8;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_ch2.adb b/gcc/ada/exp_ch2.adb
index 4e4a6ecd05e..bb6ca866acb 100644
--- a/gcc/ada/exp_ch2.adb
+++ b/gcc/ada/exp_ch2.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -45,7 +44,6 @@ with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 54352127cfe..6a0c0eee7fb 100644
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -28,7 +28,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Contracts; use Contracts;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -70,7 +69,6 @@ with Sem_SCIL; use Sem_SCIL;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index d4bc4ba21ed..92196a43305 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -28,7 +28,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -66,7 +65,6 @@ with Sem_Res; use Sem_Res;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index 6424f0a1d55..fc9e38114a9 100644
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -28,7 +28,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -49,7 +48,6 @@ with Opt; use Opt;
with Restrict; use Restrict;
with Rident; use Rident;
with Rtsfind; use Rtsfind;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sem; use Sem;
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index 9501150652a..66434ce7055 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -28,7 +28,6 @@ with Atree; use Atree;
with Aspects; use Aspects;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -72,7 +71,6 @@ with Sem_Res; use Sem_Res;
with Sem_SCIL; use Sem_SCIL;
with Sem_Util; use Sem_Util;
use Sem_Util.Storage_Model_Support;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 650b4ae9f57..e107c616d9a 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -29,7 +29,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -54,7 +53,6 @@ with Output; use Output;
with Restrict; use Restrict;
with Rident; use Rident;
with Rtsfind; use Rtsfind;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sem; use Sem;
diff --git a/gcc/ada/exp_ch8.adb b/gcc/ada/exp_ch8.adb
index 3f9dbe8ade2..3a0f8486063 100644
--- a/gcc/ada/exp_ch8.adb
+++ b/gcc/ada/exp_ch8.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Ch3; use Exp_Ch3;
@@ -41,7 +40,6 @@ with Sem; use Sem;
with Sem_Aux; use Sem_Aux;
with Sem_Ch8; use Sem_Ch8;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 636dc6f7703..b74d75fa544 100644
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -28,7 +28,6 @@ with Atree; use Atree;
with Aspects; use Aspects;
with Checks; use Checks;
with Contracts; use Contracts;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -62,7 +61,6 @@ with Sem_Elab; use Sem_Elab;
with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_code.adb b/gcc/ada/exp_code.adb
index 57c636283a9..283e17e77d3 100644
--- a/gcc/ada/exp_code.adb
+++ b/gcc/ada/exp_code.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -38,7 +37,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stringt; use Stringt;
diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb
index 55188a62c27..2d97de0163a 100644
--- a/gcc/ada/exp_dbug.adb
+++ b/gcc/ada/exp_dbug.adb
@@ -26,7 +26,6 @@
with Alloc;
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Util; use Exp_Util;
@@ -37,7 +36,6 @@ with Output; use Output;
with Sem_Aux; use Sem_Aux;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
index f19ccac11d0..96887a10a5d 100644
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -27,7 +27,6 @@ with Accessibility; use Accessibility;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -61,7 +60,6 @@ with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_dist.adb b/gcc/ada/exp_dist.adb
index a351b9b8a8f..f4376de43ab 100644
--- a/gcc/ada/exp_dist.adb
+++ b/gcc/ada/exp_dist.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -46,7 +45,6 @@ with Sem_Ch12; use Sem_Ch12;
with Sem_Dist; use Sem_Dist;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/exp_fixd.adb b/gcc/ada/exp_fixd.adb
index 1107af3e003..fdfe40ec93a 100644
--- a/gcc/ada/exp_fixd.adb
+++ b/gcc/ada/exp_fixd.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Util; use Exp_Util;
@@ -39,7 +38,6 @@ with Sem; use Sem;
with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Stand; use Stand;
with Tbuild; use Tbuild;
diff --git a/gcc/ada/exp_imgv.adb b/gcc/ada/exp_imgv.adb
index ea7b1858217..8fb5c1af4fb 100644
--- a/gcc/ada/exp_imgv.adb
+++ b/gcc/ada/exp_imgv.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Casing; use Casing;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Debug; use Debug;
@@ -43,7 +42,6 @@ with Rtsfind; use Rtsfind;
with Sem_Aux; use Sem_Aux;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_intr.adb b/gcc/ada/exp_intr.adb
index 2949b9cc43f..65581118c5f 100644
--- a/gcc/ada/exp_intr.adb
+++ b/gcc/ada/exp_intr.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -50,7 +49,6 @@ with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb
index f04016fa811..423342fd5f9 100644
--- a/gcc/ada/exp_pakd.adb
+++ b/gcc/ada/exp_pakd.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -45,7 +44,6 @@ with Sem_Ch13; use Sem_Ch13;
with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb
index f19b9f36287..666171578b6 100644
--- a/gcc/ada/exp_prag.adb
+++ b/gcc/ada/exp_prag.adb
@@ -27,7 +27,6 @@ with Atree; use Atree;
with Casing; use Casing;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -48,7 +47,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Ch8; use Sem_Ch8;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_put_image.adb b/gcc/ada/exp_put_image.adb
index 18bcb637913..8e33af27575 100644
--- a/gcc/ada/exp_put_image.adb
+++ b/gcc/ada/exp_put_image.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Csets; use Csets;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Tss; use Exp_Tss;
@@ -42,7 +41,6 @@ with Output; use Output;
with Rtsfind; use Rtsfind;
with Sem_Aux; use Sem_Aux;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_sel.adb b/gcc/ada/exp_sel.adb
index 498e6d2cdfc..6c021bcd3bb 100644
--- a/gcc/ada/exp_sel.adb
+++ b/gcc/ada/exp_sel.adb
@@ -23,7 +23,6 @@
-- --
------------------------------------------------------------------------------
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Nlists; use Nlists;
with Nmake; use Nmake;
diff --git a/gcc/ada/exp_smem.adb b/gcc/ada/exp_smem.adb
index 831b7c09f9e..e179060563d 100644
--- a/gcc/ada/exp_smem.adb
+++ b/gcc/ada/exp_smem.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -39,7 +38,6 @@ with Rtsfind; use Rtsfind;
with Sem; use Sem;
with Sem_Aux; use Sem_Aux;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_spark.adb b/gcc/ada/exp_spark.adb
index 0f9203410f2..132be79fd73 100644
--- a/gcc/ada/exp_spark.adb
+++ b/gcc/ada/exp_spark.adb
@@ -26,7 +26,6 @@
with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Attr;
@@ -52,7 +51,6 @@ with Sem_Ch13; use Sem_Ch13;
with Sem_Prag; use Sem_Prag;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_strm.adb b/gcc/ada/exp_strm.adb
index f933a2e425f..b8a0eae408c 100644
--- a/gcc/ada/exp_strm.adb
+++ b/gcc/ada/exp_strm.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -35,7 +34,6 @@ with Nlists; use Nlists;
with Nmake; use Nmake;
with Sem_Aux; use Sem_Aux;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/exp_tss.adb b/gcc/ada/exp_tss.adb
index 89af166a654..27789d80427 100644
--- a/gcc/ada/exp_tss.adb
+++ b/gcc/ada/exp_tss.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -36,7 +35,6 @@ with Rident; use Rident;
with Sem_Aux; use Sem_Aux;
with Sem_Ch6; use Sem_Ch6;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
package body Exp_Tss is
diff --git a/gcc/ada/exp_unst.adb b/gcc/ada/exp_unst.adb
index 9a1ed7067a6..2e763c4db9d 100644
--- a/gcc/ada/exp_unst.adb
+++ b/gcc/ada/exp_unst.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -42,7 +41,6 @@ with Sem_Ch8; use Sem_Ch8;
with Sem_Mech; use Sem_Mech;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index f231dab2168..1fe286f6135 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -28,7 +28,6 @@ with Atree; use Atree;
with Casing; use Casing;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Elists; use Elists;
with Errout; use Errout;
diff --git a/gcc/ada/exp_util.ads b/gcc/ada/exp_util.ads
index 318225abd69..e82acf8754a 100644
--- a/gcc/ada/exp_util.ads
+++ b/gcc/ada/exp_util.ads
@@ -29,7 +29,6 @@ with Einfo.Utils; use Einfo.Utils;
with Exp_Tss; use Exp_Tss;
with Namet; use Namet;
with Rtsfind; use Rtsfind;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Snames; use Snames;
with Types; use Types;
diff --git a/gcc/ada/expander.adb b/gcc/ada/expander.adb
index 25f49505399..9f58c95f2fc 100644
--- a/gcc/ada/expander.adb
+++ b/gcc/ada/expander.adb
@@ -47,7 +47,6 @@ with Rtsfind; use Rtsfind;
with Sem; use Sem;
with Sem_Ch8; use Sem_Ch8;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Stand; use Stand;
with Table;
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index ab04d9733f1..da53b8a922b 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -28,7 +28,6 @@ with Atree; use Atree;
with Checks; use Checks;
with Contracts; use Contracts;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -63,7 +62,6 @@ with Sem_Mech; use Sem_Mech;
with Sem_Prag; use Sem_Prag;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/frontend.adb b/gcc/ada/frontend.adb
index 3441cf5c0c8..80111e2041b 100644
--- a/gcc/ada/frontend.adb
+++ b/gcc/ada/frontend.adb
@@ -60,7 +60,6 @@ with Sem_SCIL;
with Sem_Elab; use Sem_Elab;
with Sem_Prag; use Sem_Prag;
with Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/ghost.adb b/gcc/ada/ghost.adb
index 5231ef90e08..4fad46d02ac 100644
--- a/gcc/ada/ghost.adb
+++ b/gcc/ada/ghost.adb
@@ -26,7 +26,6 @@
with Alloc;
with Aspects; use Aspects;
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -39,7 +38,6 @@ with Sem_Disp; use Sem_Disp;
with Sem_Eval; use Sem_Eval;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index 4653741501a..cc19e424afa 100644
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -33,7 +33,6 @@ with Elists;
with Errout; use Errout;
with Exp_CG;
with Fmap;
-with Fname; use Fname;
with Fname.UF; use Fname.UF;
with Frontend;
with Ghost; use Ghost;
@@ -65,7 +64,6 @@ with Sem_Eval;
with Sem_Prag;
with Sem_Type;
with Set_Targ;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinput; use Sinput;
with Sinput.L; use Sinput.L;
diff --git a/gcc/ada/gnat_cuda.adb b/gcc/ada/gnat_cuda.adb
index 80080e08293..13d6a5d653c 100644
--- a/gcc/ada/gnat_cuda.adb
+++ b/gcc/ada/gnat_cuda.adb
@@ -36,7 +36,6 @@ with Nmake; use Nmake;
with Sem_Aux; use Sem_Aux;
with Sem_Util; use Sem_Util;
with Sinfo.Nodes; use Sinfo.Nodes;
-with Sinfo; use Sinfo;
with GNAT.HTable;
diff --git a/gcc/ada/impunit.adb b/gcc/ada/impunit.adb
index 712d46c54ab..b73c65e0c2a 100644
--- a/gcc/ada/impunit.adb
+++ b/gcc/ada/impunit.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Errout; use Errout;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Fname.UF; use Fname.UF;
with Lib; use Lib;
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index 3833af8e84a..2fb4aeba4e2 100644
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -27,7 +27,6 @@ with Alloc;
with Aspects; use Aspects;
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -35,7 +34,6 @@ with Errout; use Errout;
with Exp_Ch6; use Exp_Ch6;
with Exp_Ch7; use Exp_Ch7;
with Exp_Util; use Exp_Util;
-with Fname; use Fname;
with Fname.UF; use Fname.UF;
with Lib; use Lib;
with Namet; use Namet;
@@ -49,7 +47,6 @@ with Sem_Ch12; use Sem_Ch12;
with Sem_Prag; use Sem_Prag;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/itypes.adb b/gcc/ada/itypes.adb
index 98734d8c354..7407629ac5f 100644
--- a/gcc/ada/itypes.adb
+++ b/gcc/ada/itypes.adb
@@ -25,7 +25,6 @@
with Einfo.Utils; use Einfo.Utils;
with Sem; use Sem;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Stand; use Stand;
with Targparm; use Targparm;
diff --git a/gcc/ada/itypes.ads b/gcc/ada/itypes.ads
index 9228a7d728a..f2e9a73771c 100644
--- a/gcc/ada/itypes.ads
+++ b/gcc/ada/itypes.ads
@@ -25,7 +25,6 @@
-- This package contains declarations for handling of implicit types
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Sem_Util; use Sem_Util;
with Types; use Types;
diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb
index 841abf25f38..88af2ed5689 100644
--- a/gcc/ada/layout.adb
+++ b/gcc/ada/layout.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -34,7 +33,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Ch13; use Sem_Ch13;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/lib.adb b/gcc/ada/lib.adb
index 3fd9540acb3..766f60938a4 100644
--- a/gcc/ada/lib.adb
+++ b/gcc/ada/lib.adb
@@ -29,12 +29,10 @@ pragma Style_Checks (All_Checks);
with Atree; use Atree;
with Csets; use Csets;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Nlists; use Nlists;
with Opt; use Opt;
with Output; use Output;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/libgnarl/s-tasuti.adb b/gcc/ada/libgnarl/s-tasuti.adb
index 76f63c96838..d85fe1814f5 100644
--- a/gcc/ada/libgnarl/s-tasuti.adb
+++ b/gcc/ada/libgnarl/s-tasuti.adb
@@ -43,7 +43,6 @@ package body System.Tasking.Utilities is
package STPO renames System.Task_Primitives.Operations;
use Tasking.Debug;
- use Task_Primitives;
use Task_Primitives.Operations;
--------------------
diff --git a/gcc/ada/live.adb b/gcc/ada/live.adb
index 9cf3228fbf1..6dff0ae08f0 100644
--- a/gcc/ada/live.adb
+++ b/gcc/ada/live.adb
@@ -24,14 +24,12 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Lib; use Lib;
with Nlists; use Nlists;
with Sem_Aux; use Sem_Aux;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Types; use Types;
diff --git a/gcc/ada/local_restrict.adb b/gcc/ada/local_restrict.adb
index 3c3cfd2fa46..384af4d2428 100644
--- a/gcc/ada/local_restrict.adb
+++ b/gcc/ada/local_restrict.adb
@@ -25,7 +25,6 @@
with Aspects; use Aspects;
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
diff --git a/gcc/ada/mutably_tagged.adb b/gcc/ada/mutably_tagged.adb
index b04ba92e5aa..518b8f3c528 100644
--- a/gcc/ada/mutably_tagged.adb
+++ b/gcc/ada/mutably_tagged.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Casing; use Casing;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Util; use Exp_Util;
@@ -35,7 +34,6 @@ with Nmake; use Nmake;
with Rtsfind; use Rtsfind;
with Snames; use Snames;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stringt; use Stringt;
diff --git a/gcc/ada/nlists.adb b/gcc/ada/nlists.adb
index a01819902f0..34f74d55d8a 100644
--- a/gcc/ada/nlists.adb
+++ b/gcc/ada/nlists.adb
@@ -30,7 +30,6 @@ with Alloc;
with Atree; use Atree;
with Debug; use Debug;
with Output; use Output;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Table;
diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb
index 13f5349c808..2027514d0ee 100644
--- a/gcc/ada/par.adb
+++ b/gcc/ada/par.adb
@@ -29,7 +29,6 @@ with Casing; use Casing;
with Debug; use Debug;
with Elists; use Elists;
with Errout; use Errout;
-with Fname; use Fname;
with Lib; use Lib;
with Namet; use Namet;
with Namet.Sp; use Namet.Sp;
@@ -44,7 +43,6 @@ with Scn; use Scn;
with Sem_Util; use Sem_Util;
with Sinput; use Sinput;
with Sinput.L; use Sinput.L;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/par_sco.adb b/gcc/ada/par_sco.adb
index 3575ad5f3db..584c6281a12 100644
--- a/gcc/ada/par_sco.adb
+++ b/gcc/ada/par_sco.adb
@@ -37,7 +37,6 @@ with Put_SCOs;
with SCOs; use SCOs;
with Sem; use Sem;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/pprint.adb b/gcc/ada/pprint.adb
index 225a49477aa..3e8ebc6924d 100644
--- a/gcc/ada/pprint.adb
+++ b/gcc/ada/pprint.adb
@@ -24,14 +24,12 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
with Namet; use Namet;
with Nlists; use Nlists;
with Opt; use Opt;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb
index 14c29305690..dd53dc3fa87 100644
--- a/gcc/ada/repinfo.adb
+++ b/gcc/ada/repinfo.adb
@@ -27,7 +27,6 @@ with Alloc;
with Atree; use Atree;
with Casing; use Casing;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with GNAT.Heap_Sort_G;
@@ -40,7 +39,6 @@ with Osint.C; use Osint.C;
with Sem_Aux; use Sem_Aux;
with Sem_Eval; use Sem_Eval;
with Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/restrict.adb b/gcc/ada/restrict.adb
index d42efd64a11..a413a7abd25 100644
--- a/gcc/ada/restrict.adb
+++ b/gcc/ada/restrict.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Casing; use Casing;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -34,7 +33,6 @@ with Fname; use Fname;
with Fname.UF; use Fname.UF;
with Lib; use Lib;
with Opt; use Opt;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/rtsfind.adb b/gcc/ada/rtsfind.adb
index e15e93f2fba..b5018862ada 100644
--- a/gcc/ada/rtsfind.adb
+++ b/gcc/ada/rtsfind.adb
@@ -27,13 +27,11 @@ with Atree; use Atree;
with Casing; use Casing;
with Csets; use Csets;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
with Errout; use Errout;
with Exp_Dist;
-with Fname; use Fname;
with Fname.UF; use Fname.UF;
with Ghost; use Ghost;
with Lib; use Lib;
@@ -47,10 +45,9 @@ with Restrict; use Restrict;
with Sem; use Sem;
with Sem_Aux; use Sem_Aux;
with Sem_Ch7; use Sem_Ch7;
-with Sem_Ch12; use Sem_Ch12;
+with Sem_Ch12; use Sem_Ch12;
with Sem_Dist; use Sem_Dist;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/scil_ll.adb b/gcc/ada/scil_ll.adb
index 3722ce8e822..0f01f32897f 100644
--- a/gcc/ada/scil_ll.adb
+++ b/gcc/ada/scil_ll.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Opt; use Opt;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with System.HTable; use System.HTable;
diff --git a/gcc/ada/scn.adb b/gcc/ada/scn.adb
index 701bf34d254..bf2ebba82e6 100644
--- a/gcc/ada/scn.adb
+++ b/gcc/ada/scn.adb
@@ -29,7 +29,6 @@ with Namet; use Namet;
with Restrict; use Restrict;
with Rident; use Rident;
with Scans; use Scans;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinput; use Sinput;
with Uintp; use Uintp;
diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb
index 71e759e74c4..29ecee76c8f 100644
--- a/gcc/ada/sem.adb
+++ b/gcc/ada/sem.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Debug; use Debug;
with Debug_A; use Debug_A;
-with Einfo; use Einfo;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
with Exp_SPARK; use Exp_SPARK;
@@ -52,7 +51,6 @@ with Sem_Ch12; use Sem_Ch12;
with Sem_Ch13; use Sem_Ch13;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 928f4f7bbc4..ae01956ab4f 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -26,7 +26,6 @@
with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
with Errid; use Errid;
@@ -59,7 +58,6 @@ with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
with Sem_Type; use Sem_Type;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
with Stringt; use Stringt;
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index af4994419eb..e7144920174 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -31,7 +31,6 @@ with Atree; use Atree;
with Casing; use Casing;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -72,7 +71,6 @@ with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sem_aux.adb b/gcc/ada/sem_aux.adb
index 107e27e2e43..eb0f8f161d5 100644
--- a/gcc/ada/sem_aux.adb
+++ b/gcc/ada/sem_aux.adb
@@ -24,10 +24,8 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Utils; use Einfo.Utils;
with Nlists; use Nlists;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_case.adb b/gcc/ada/sem_case.adb
index 050e456d49c..00425087a9c 100644
--- a/gcc/ada/sem_case.adb
+++ b/gcc/ada/sem_case.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -41,7 +40,6 @@ with Sem_Util; use Sem_Util;
with Sem_Type; use Sem_Type;
with Snames; use Snames;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stringt; use Stringt;
diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index a90f04f3f36..ccfd29eb568 100644
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -40,7 +39,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Dist; use Sem_Dist;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
index 9cd86d6bc1d..6bf38202d5b 100644
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Contracts; use Contracts;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -35,7 +34,6 @@ with Exp_Disp; use Exp_Disp;
with Exp_Put_Image;
with Exp_Util; use Exp_Util;
with Elists; use Elists;
-with Fname; use Fname;
with Fname.UF; use Fname.UF;
with Freeze; use Freeze;
with Impunit; use Impunit;
@@ -64,7 +62,6 @@ with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinfo.CN; use Sinfo.CN;
diff --git a/gcc/ada/sem_ch11.adb b/gcc/ada/sem_ch11.adb
index 26a3596e7b4..5ce6832961e 100644
--- a/gcc/ada/sem_ch11.adb
+++ b/gcc/ada/sem_ch11.adb
@@ -25,11 +25,9 @@
with Atree; use Atree;
with Checks; use Checks;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
-with Lib; use Lib;
with Lib.Xref; use Lib.Xref;
with Namet; use Namet;
with Nlists; use Nlists;
@@ -46,7 +44,6 @@ with Sem_Ch13; use Sem_Ch13;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 729a6b145ac..e112a42e818 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -27,14 +27,12 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Contracts; use Contracts;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
with Errout; use Errout;
with Expander; use Expander;
with Exp_Dbug; use Exp_Dbug;
-with Fname; use Fname;
with Fname.UF; use Fname.UF;
with Freeze; use Freeze;
with Ghost; use Ghost;
@@ -70,7 +68,6 @@ with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinfo.CN; use Sinfo.CN;
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 0aad2f92ca0..f79e85448b7 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -29,7 +29,6 @@ with Atree; use Atree;
with Checks; use Checks;
with Contracts; use Contracts;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -70,7 +69,6 @@ with Sem_Res; use Sem_Res;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sem_ch2.adb b/gcc/ada/sem_ch2.adb
index df4aa6a4b55..9f67a27c7ce 100644
--- a/gcc/ada/sem_ch2.adb
+++ b/gcc/ada/sem_ch2.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -39,7 +38,6 @@ with Sem; use Sem;
with Sem_Ch8; use Sem_Ch8;
with Sem_Dim; use Sem_Dim;
with Sem_Res; use Sem_Res;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 994f60dc9a7..84c69191cb6 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -30,7 +30,6 @@ with Checks; use Checks;
with Contracts; use Contracts;
with Debug; use Debug;
with Elists; use Elists;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -80,7 +79,6 @@ with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 38e013a9dc4..e725c013ad7 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -27,7 +27,6 @@ with Accessibility; use Accessibility;
with Aspects; use Aspects;
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -64,7 +63,6 @@ with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
index e6bba80c5f1..dc1625845ea 100644
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -60,7 +59,6 @@ with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Snames; use Snames;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Targparm; use Targparm;
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 154aa96dde4..a689f2103c6 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -29,7 +29,6 @@ with Atree; use Atree;
with Checks; use Checks;
with Contracts; use Contracts;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -81,7 +80,6 @@ with Sem_Type; use Sem_Type;
with Sem_Warn; use Sem_Warn;
with Sinput; use Sinput;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinfo.CN; use Sinfo.CN;
diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb
index 6032487d59f..f7afc58c546 100644
--- a/gcc/ada/sem_ch7.adb
+++ b/gcc/ada/sem_ch7.adb
@@ -32,7 +32,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Contracts; use Contracts;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -66,7 +65,6 @@ with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Snames; use Snames;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index 720e7f71662..c4628e95912 100644
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
with Errout; use Errout;
@@ -68,7 +67,6 @@ with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
with Sem_Type; use Sem_Type;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinfo.CN; use Sinfo.CN;
@@ -9579,26 +9577,17 @@ package body Sem_Ch8 is
return;
end if;
+ -- We need to mark the previous use clauses as effective, but each
+ -- use clause may in turn render other use clauses effective.
+
Curr := Current_Use_Clause (Pak);
while Present (Curr)
and then not Is_Effective_Use_Clause (Curr)
loop
- -- We need to mark the previous use clauses as effective, but
- -- each use clause may in turn render other use_package_clauses
- -- effective. Additionally, it is possible to have a parent
- -- package renamed as a child of itself so we must check the
- -- prefix entity is not the same as the package we are marking.
+ -- It is possible to have a child package without a prefix that
+ -- relies on a previous use clause.
- if Nkind (Name (Curr)) /= N_Identifier
- and then Present (Prefix (Name (Curr)))
- and then Entity (Prefix (Name (Curr))) /= Pak
- then
- Mark_Use_Package (Entity (Prefix (Name (Curr))));
-
- -- It is also possible to have a child package without a prefix
- -- that relies on a previous use_package_clause.
-
- elsif Nkind (Name (Curr)) = N_Identifier
+ if Nkind (Name (Curr)) = N_Identifier
and then Is_Child_Unit (Entity (Name (Curr)))
then
Mark_Use_Package (Scope (Entity (Name (Curr))));
diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
index bf387d35a65..9af9a954ee0 100644
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -28,7 +28,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Contracts; use Contracts;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errid; use Errid;
@@ -62,7 +61,6 @@ with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Snames; use Snames;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Style;
diff --git a/gcc/ada/sem_dim.adb b/gcc/ada/sem_dim.adb
index 822c1284d53..c2e1d6410e4 100644
--- a/gcc/ada/sem_dim.adb
+++ b/gcc/ada/sem_dim.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -40,7 +39,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_disp.adb b/gcc/ada/sem_disp.adb
index 0e89af8f0a7..57b7973d079 100644
--- a/gcc/ada/sem_disp.adb
+++ b/gcc/ada/sem_disp.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Debug; use Debug;
with Elists; use Elists;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Exp_Disp; use Exp_Disp;
@@ -52,7 +51,6 @@ with Sem_Eval; use Sem_Eval;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Snames; use Snames;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Tbuild; use Tbuild;
diff --git a/gcc/ada/sem_dist.adb b/gcc/ada/sem_dist.adb
index 5b6f74cca30..c9b80d11249 100644
--- a/gcc/ada/sem_dist.adb
+++ b/gcc/ada/sem_dist.adb
@@ -25,7 +25,6 @@
with Atree; use Atree;
with Casing; use Casing;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -42,7 +41,6 @@ with Sem_Disp; use Sem_Disp;
with Sem_Eval; use Sem_Eval;
with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Stand; use Stand;
diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb
index 4d57a86529a..17d0261195b 100644
--- a/gcc/ada/sem_elab.adb
+++ b/gcc/ada/sem_elab.adb
@@ -27,7 +27,6 @@ with ALI; use ALI;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -53,7 +52,6 @@ with Sem_Ch8; use Sem_Ch8;
with Sem_Disp; use Sem_Disp;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sem_elim.adb b/gcc/ada/sem_elim.adb
index 7d9dca824c0..596e4c6b758 100644
--- a/gcc/ada/sem_elim.adb
+++ b/gcc/ada/sem_elim.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -37,7 +36,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
with Sinput; use Sinput;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Snames; use Snames;
with Stand; use Stand;
diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
index be372e76678..72d8b48211d 100644
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -55,7 +54,6 @@ with Sem_Res; use Sem_Res;
with Sem_Util; use Sem_Util;
with Sem_Type; use Sem_Type;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_intr.adb b/gcc/ada/sem_intr.adb
index 9c266ca5864..20d54ee957b 100644
--- a/gcc/ada/sem_intr.adb
+++ b/gcc/ada/sem_intr.adb
@@ -26,7 +26,6 @@
-- Processing for intrinsic subprogram declarations
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -36,7 +35,6 @@ with Opt; use Opt;
with Sem_Aux; use Sem_Aux;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_mech.adb b/gcc/ada/sem_mech.adb
index 8b7d4264182..33f11dd29ee 100644
--- a/gcc/ada/sem_mech.adb
+++ b/gcc/ada/sem_mech.adb
@@ -24,14 +24,12 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
with Namet; use Namet;
with Sem; use Sem;
with Sem_Aux; use Sem_Aux;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Snames; use Snames;
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index a3eeef9ae66..10356793649 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -36,7 +36,6 @@ with Checks; use Checks;
with Contracts; use Contracts;
with Csets; use Csets;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -79,7 +78,6 @@ with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinfo.CN; use Sinfo.CN;
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index bfbfc109944..108a4f9d06b 100644
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -29,7 +29,6 @@ with Atree; use Atree;
with Checks; use Checks;
with Debug; use Debug;
with Debug_A; use Debug_A;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -80,7 +79,6 @@ with Sem_Mech; use Sem_Mech;
with Sem_Type; use Sem_Type;
with Sem_Util; use Sem_Util;
with Sem_Warn; use Sem_Warn;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinfo.CN; use Sinfo.CN;
diff --git a/gcc/ada/sem_scil.adb b/gcc/ada/sem_scil.adb
index 791a0a2c3dd..d9582c1c39e 100644
--- a/gcc/ada/sem_scil.adb
+++ b/gcc/ada/sem_scil.adb
@@ -23,13 +23,11 @@
-- --
------------------------------------------------------------------------------
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Nlists; use Nlists;
with Rtsfind; use Rtsfind;
with Sem_Aux; use Sem_Aux;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Stand; use Stand;
with SCIL_LL; use SCIL_LL;
diff --git a/gcc/ada/sem_smem.adb b/gcc/ada/sem_smem.adb
index b326fe215fa..7004a39c640 100644
--- a/gcc/ada/sem_smem.adb
+++ b/gcc/ada/sem_smem.adb
@@ -24,13 +24,11 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
with Namet; use Namet;
with Sem_Aux; use Sem_Aux;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Snames; use Snames;
diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb
index b6bfa2a80cf..702b248839d 100644
--- a/gcc/ada/sem_type.adb
+++ b/gcc/ada/sem_type.adb
@@ -27,7 +27,6 @@ with Aspects; use Aspects;
with Atree; use Atree;
with Alloc;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -46,7 +45,6 @@ with Sem_Disp; use Sem_Disp;
with Sem_Dist; use Sem_Dist;
with Sem_Util; use Sem_Util;
with Stand; use Stand;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index ade2227ff00..31bcd98d468 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -63,7 +63,6 @@ with Sem_Prag; use Sem_Prag;
with Sem_Res; use Sem_Res;
with Sem_Warn; use Sem_Warn;
with Sem_Type; use Sem_Type;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads
index 15e6ee1ce70..e7d4cd9f437 100644
--- a/gcc/ada/sem_util.ads
+++ b/gcc/ada/sem_util.ads
@@ -27,7 +27,6 @@
with Aspects; use Aspects;
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Exp_Tss; use Exp_Tss;
with Namet; use Namet;
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index f085149a15d..d121e698586 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -26,7 +26,6 @@
with Accessibility; use Accessibility;
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
@@ -43,7 +42,6 @@ with Sem_Aux; use Sem_Aux;
with Sem_Eval; use Sem_Eval;
with Sem_Prag; use Sem_Prag;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/sinput.adb b/gcc/ada/sinput.adb
index f3a5033b1c7..bf63906268b 100644
--- a/gcc/ada/sinput.adb
+++ b/gcc/ada/sinput.adb
@@ -31,7 +31,6 @@ with Debug; use Debug;
with Opt; use Opt;
with Output; use Output;
with Scans; use Scans;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Widechar; use Widechar;
diff --git a/gcc/ada/sprint.adb b/gcc/ada/sprint.adb
index ee9013e38ad..b1cc603a5eb 100644
--- a/gcc/ada/sprint.adb
+++ b/gcc/ada/sprint.adb
@@ -28,7 +28,6 @@ with Atree; use Atree;
with Casing; use Casing;
with Csets; use Csets;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Lib; use Lib;
@@ -39,7 +38,6 @@ with Output; use Output;
with Rtsfind; use Rtsfind;
with Sem_Eval; use Sem_Eval;
with Sem_Util; use Sem_Util;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
diff --git a/gcc/ada/strub.adb b/gcc/ada/strub.adb
index 00123fb51a6..3582393973b 100644
--- a/gcc/ada/strub.adb
+++ b/gcc/ada/strub.adb
@@ -26,13 +26,11 @@
-- Package containing utility procedures related to Stack Scrubbing
with Atree; use Atree;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Errout; use Errout;
with Namet; use Namet;
with Nlists; use Nlists;
with Sem_Eval; use Sem_Eval;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/style.adb b/gcc/ada/style.adb
index e202631eab6..70b4aca0bf0 100644
--- a/gcc/ada/style.adb
+++ b/gcc/ada/style.adb
@@ -26,14 +26,12 @@
with Atree; use Atree;
with Casing; use Casing;
with Csets; use Csets;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Errout; use Errout;
with Namet; use Namet;
with Nlists; use Nlists;
with Opt; use Opt;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinput; use Sinput;
with Snames; use Snames;
diff --git a/gcc/ada/styleg.adb b/gcc/ada/styleg.adb
index 46499fff7f1..8cb12bf9421 100644
--- a/gcc/ada/styleg.adb
+++ b/gcc/ada/styleg.adb
@@ -34,7 +34,6 @@ with Err_Vars; use Err_Vars;
with Errout;
with Opt; use Opt;
with Scans; use Scans;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinput; use Sinput;
with Stylesw; use Stylesw;
diff --git a/gcc/ada/tbuild.adb b/gcc/ada/tbuild.adb
index 2840707f2e9..312fdf0c851 100644
--- a/gcc/ada/tbuild.adb
+++ b/gcc/ada/tbuild.adb
@@ -26,7 +26,6 @@
with Atree; use Atree;
with Aspects; use Aspects;
with Csets; use Csets;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Lib; use Lib;
diff --git a/gcc/ada/tbuild.ads b/gcc/ada/tbuild.ads
index 3a0adff97c7..85e2fe46a24 100644
--- a/gcc/ada/tbuild.ads
+++ b/gcc/ada/tbuild.ads
@@ -27,7 +27,6 @@
-- specific types of tree nodes.
with Namet; use Namet;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Types; use Types;
with Uintp; use Uintp;
diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb
index d1fa9c2540d..536ceb29297 100644
--- a/gcc/ada/treepr.adb
+++ b/gcc/ada/treepr.adb
@@ -27,7 +27,6 @@ with Ada.Unchecked_Conversion;
with Aspects; use Aspects;
with Atree; use Atree;
with Debug; use Debug;
-with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
with Einfo.Utils; use Einfo.Utils;
with Elists; use Elists;
@@ -38,7 +37,6 @@ with Nlists; use Nlists;
with Output; use Output;
with Seinfo; use Seinfo;
with Sem_Eval; use Sem_Eval;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Snames; use Snames;
diff --git a/gcc/ada/uname.adb b/gcc/ada/uname.adb
index 6d482cfccd6..93758b9dae2 100644
--- a/gcc/ada/uname.adb
+++ b/gcc/ada/uname.adb
@@ -25,13 +25,11 @@
with Atree; use Atree;
with Casing; use Casing;
-with Einfo; use Einfo;
with Einfo.Utils; use Einfo.Utils;
with Hostparm;
with Lib; use Lib;
with Nlists; use Nlists;
with Output; use Output;
-with Sinfo; use Sinfo;
with Sinfo.Nodes; use Sinfo.Nodes;
with Sinfo.Utils; use Sinfo.Utils;
with Sinput; use Sinput;
--
2.51.0
