On Mon, Sep 14, 2026 at 3:27 PM Léo Hardt <[email protected]> wrote: > > Removed instances in which headers were included twice (always the second > one). This happened because, when some functions were moved to attribs.h > (314e6352), including stringpool+attribs was done in bulk, without checking > whether stringpool was already included. > > Notice include-guards in stringpool.h. Including it twice has no effect. > > You can check the validity of this commit by running: > > find . -maxdepth 1 -type f -name "*.cc" \ > | xargs grep '#include "stringpool.h"' \ > | sed 's/\(.*\):.*/\1/' \ > | sort \ > | uniq -c -d \ > | sort \ > | sed 's/\(.*\)/'' \1 /' > > inside ./gcc on the current trunk.
I assume you tested this with a bootstrap at least? OK. Richard. > Best regards, > > gcc/ChangeLog: > > * asan.cc: Remove duplicate stringpool includes. > * builtins.cc: Likewise. > * calls.cc: Likewise. > * cgraphunit.cc: Likewise. > * dwarf2out.cc: Likewise. > * fold-const.cc: Likewise. > * function.cc: Likewise. > * gimple-expr.cc: Likewise. > * internal-fn.cc: Likewise. > * ipa.cc: Likewise. > * lto-cgraph.cc: Likewise. > * pointer-query.cc: Likewise. > * tree-streamer-in.cc: Likewise. > * varasm.cc: Likewise. > > Signed-off-by: Léo Hardt <[email protected]> > --- > gcc/asan.cc | 1 - > gcc/builtins.cc | 1 - > gcc/calls.cc | 1 - > gcc/cgraphunit.cc | 1 - > gcc/dwarf2out.cc | 1 - > gcc/fold-const.cc | 1 - > gcc/function.cc | 1 - > gcc/gimple-expr.cc | 1 - > gcc/internal-fn.cc | 1 - > gcc/ipa.cc | 1 - > gcc/lto-cgraph.cc | 1 - > gcc/pointer-query.cc | 1 - > gcc/tree-streamer-in.cc | 1 - > gcc/varasm.cc | 1 - > 14 files changed, 14 deletions(-) > > diff --git a/gcc/asan.cc b/gcc/asan.cc > index 7f625fdcfa0..6feeae30e35 100644 > --- a/gcc/asan.cc > +++ b/gcc/asan.cc > @@ -47,7 +47,6 @@ along with GCC; see the file COPYING3. If not see > #include "varasm.h" > #include "stor-layout.h" > #include "tree-iterator.h" > -#include "stringpool.h" > #include "attribs.h" > #include "asan.h" > #include "dojump.h" > diff --git a/gcc/builtins.cc b/gcc/builtins.cc > index 056fd20c4c6..a41e26dc39c 100644 > --- a/gcc/builtins.cc > +++ b/gcc/builtins.cc > @@ -62,7 +62,6 @@ along with GCC; see the file COPYING3. If not see > #include "langhooks.h" > #include "value-prof.h" > #include "builtins.h" > -#include "stringpool.h" > #include "attribs.h" > #include "asan.h" > #include "internal-fn.h" > diff --git a/gcc/calls.cc b/gcc/calls.cc > index e5d67b6c97a..d4f66bc47f2 100644 > --- a/gcc/calls.cc > +++ b/gcc/calls.cc > @@ -50,7 +50,6 @@ along with GCC; see the file COPYING3. If not see > #include "tree-vrp.h" > #include "tree-ssanames.h" > #include "intl.h" > -#include "stringpool.h" > #include "hash-map.h" > #include "hash-traits.h" > #include "attribs.h" > diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc > index d397c9ae4cc..7a7278ace5a 100644 > --- a/gcc/cgraphunit.cc > +++ b/gcc/cgraphunit.cc > @@ -205,7 +205,6 @@ along with GCC; see the file COPYING3. If not see > #include "tree-nested.h" > #include "dbgcnt.h" > #include "lto-section-names.h" > -#include "stringpool.h" > #include "attribs.h" > #include "ipa-inline.h" > #include "omp-offload.h" > diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc > index 0b974d63c80..d170e18c740 100644 > --- a/gcc/dwarf2out.cc > +++ b/gcc/dwarf2out.cc > @@ -95,7 +95,6 @@ along with GCC; see the file COPYING3. If not see > #include "tree-dfa.h" > #include "gdb/gdb-index.h" > #include "rtl-iter.h" > -#include "stringpool.h" > #include "attribs.h" > #include "file-prefix-map.h" /* remap_debug_filename() */ > > diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc > index 4c4b535d440..b9262b34f76 100644 > --- a/gcc/fold-const.cc > +++ b/gcc/fold-const.cc > @@ -80,7 +80,6 @@ along with GCC; see the file COPYING3. If not see > #include "tree-vrp.h" > #include "tree-ssanames.h" > #include "selftest.h" > -#include "stringpool.h" > #include "attribs.h" > #include "tree-vector-builder.h" > #include "vec-perm-indices.h" > diff --git a/gcc/function.cc b/gcc/function.cc > index 9358787b262..fd9da3003cd 100644 > --- a/gcc/function.cc > +++ b/gcc/function.cc > @@ -77,7 +77,6 @@ along with GCC; see the file COPYING3. If not see > #include "rtl-iter.h" > #include "tree-dfa.h" > #include "tree-ssa.h" > -#include "stringpool.h" > #include "attribs.h" > #include "gimple.h" > #include "options.h" > diff --git a/gcc/gimple-expr.cc b/gcc/gimple-expr.cc > index 3b8726ded4d..fcc31b99390 100644 > --- a/gcc/gimple-expr.cc > +++ b/gcc/gimple-expr.cc > @@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see > #include "hash-set.h" > #include "rtl.h" > #include "tree-pass.h" > -#include "stringpool.h" > #include "attribs.h" > #include "target.h" > > diff --git a/gcc/internal-fn.cc b/gcc/internal-fn.cc > index c57b594ac59..354e9276254 100644 > --- a/gcc/internal-fn.cc > +++ b/gcc/internal-fn.cc > @@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see > #include "stor-layout.h" > #include "dojump.h" > #include "expr.h" > -#include "stringpool.h" > #include "attribs.h" > #include "asan.h" > #include "ubsan.h" > diff --git a/gcc/ipa.cc b/gcc/ipa.cc > index 908fb301cd0..0a5f031c639 100644 > --- a/gcc/ipa.cc > +++ b/gcc/ipa.cc > @@ -39,7 +39,6 @@ along with GCC; see the file COPYING3. If not see > #include "ipa-fnsummary.h" > #include "dbgcnt.h" > #include "debug.h" > -#include "stringpool.h" > #include "attribs.h" > > /* Return true when NODE has ADDR reference. */ > diff --git a/gcc/lto-cgraph.cc b/gcc/lto-cgraph.cc > index adbf59ca821..bffe35f2353 100644 > --- a/gcc/lto-cgraph.cc > +++ b/gcc/lto-cgraph.cc > @@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see > #include "ipa-utils.h" > #include "omp-offload.h" > #include "omp-general.h" > -#include "stringpool.h" > #include "attribs.h" > #include "alloc-pool.h" > #include "symbol-summary.h" > diff --git a/gcc/pointer-query.cc b/gcc/pointer-query.cc > index b5ab5cbd1ab..e230d5f23c5 100644 > --- a/gcc/pointer-query.cc > +++ b/gcc/pointer-query.cc > @@ -31,7 +31,6 @@ > #include "tree-object-size.h" > #include "tree-ssa-strlen.h" > #include "langhooks.h" > -#include "stringpool.h" > #include "attribs.h" > #include "gimple-iterator.h" > #include "gimple-fold.h" > diff --git a/gcc/tree-streamer-in.cc b/gcc/tree-streamer-in.cc > index 595206e0bee..45ba2732d3a 100644 > --- a/gcc/tree-streamer-in.cc > +++ b/gcc/tree-streamer-in.cc > @@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see > #include "cgraph.h" > #include "builtins.h" > #include "gomp-constants.h" > -#include "stringpool.h" > #include "attribs.h" > #include "asan.h" > #include "opts.h" > diff --git a/gcc/varasm.cc b/gcc/varasm.cc > index ad39bdddcfc..bcaf8074951 100644 > --- a/gcc/varasm.cc > +++ b/gcc/varasm.cc > @@ -53,7 +53,6 @@ along with GCC; see the file COPYING3. If not see > #include "langhooks.h" > #include "debug.h" > #include "common/common-target.h" > -#include "stringpool.h" > #include "attribs.h" > #include "asan.h" > #include "rtl-iter.h" > -- > 2.47.3 >
