diff --git a/gcc/analyzer/supergraph.cc b/gcc/analyzer/supergraph.cc
index 466f924518171650422c4d5007c0ad013dbfb05b..f023c533a09f1390e395e4740410602ac9690941 100644
--- a/gcc/analyzer/supergraph.cc
+++ b/gcc/analyzer/supergraph.cc
@@ -29,13 +29,13 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "basic-block.h"
#include "function.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
#include "timevar.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "gimple-pretty-print.h"
#include "tree-pretty-print.h"
#include "graphviz.h"
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 5b085e3a14f5e48d99a0b09716bca22047e43e38..5fc89adf01b33b94764956dc967397d148a1c31f 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -67,13 +67,13 @@ along with GCC; see the file COPYING3. If not see
#include "asan.h"
#include "internal-fn.h"
#include "case-cfn-macros.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "intl.h"
#include "file-prefix-map.h" /* remap_macro_filename() */
#include "gomp-constants.h"
#include "omp-general.h"
#include "tree-dfa.h"
-#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "tree-ssa-live.h"
#include "tree-outof-ssa.h"
diff --git a/gcc/c-family/c-omp.cc b/gcc/c-family/c-omp.cc
index 987ba7d724aea62955d368e563eaa6a9883c4086..01ef4ee402361d4f0c513e2c28793c76ae7c1858 100644
--- a/gcc/c-family/c-omp.cc
+++ b/gcc/c-family/c-omp.cc
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify.h"
#include "langhooks.h"
#include "bitmap.h"
-#include "gimple-fold.h"
/* Complete a #pragma oacc wait construct. LOC is the location of
diff --git a/gcc/calls.cc b/gcc/calls.cc
index 4d0bc45be280f3936928f93e4b0dc761b421efdf..bbaf69c2d67a53dea6f072b6c28d5cd84b8d0dca 100644
--- a/gcc/calls.cc
+++ b/gcc/calls.cc
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3. If not see
#include "hash-traits.h"
#include "attribs.h"
#include "builtins.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "attr-fnspec.h"
#include "value-query.h"
diff --git a/gcc/cgraphbuild.cc b/gcc/cgraphbuild.cc
index 138484c27677175115d2de48e3af68491e749743..fdd17aa5a2d97d9d834b2f88045620d9a5bba9c6 100644
--- a/gcc/cgraphbuild.cc
+++ b/gcc/cgraphbuild.cc
@@ -26,8 +26,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-pass.h"
#include "cgraph.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "gimple-walk.h"
#include "ipa-utils.h"
#include "except.h"
diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc
index bc3dc754481f6af51c685664753a0c83a935644d..e77bf97bea39493729369d0c7a2ee05345d9f734 100644
--- a/gcc/cgraphunit.cc
+++ b/gcc/cgraphunit.cc
@@ -179,9 +179,9 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "output.h"
#include "cfgcleanup.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "tree-cfg.h"
#include "tree-into-ssa.h"
diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc
index e925ba9fad9cce1c8cfafc91a0773251fa7bc73a..b60dde9dfbc6dde82e85413d64fb3c1a3a2ae1a3 100644
--- a/gcc/config/rs6000/rs6000-builtin.cc
+++ b/gcc/config/rs6000/rs6000-builtin.cc
@@ -45,8 +45,8 @@
#include "expr.h"
#include "langhooks.h"
#include "gimplify.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "ssa.h"
#include "tree-ssa-propagate.h"
#include "builtins.h"
diff --git a/gcc/config/rs6000/rs6000-call.cc b/gcc/config/rs6000/rs6000-call.cc
index f06c69252b2f84d370bb03792c1abe47ba2e9bae..6011fe8d3c568b6b95cc48aeceb7af13f79383fd 100644
--- a/gcc/config/rs6000/rs6000-call.cc
+++ b/gcc/config/rs6000/rs6000-call.cc
@@ -55,8 +55,8 @@
#include "common/common-target.h"
#include "langhooks.h"
#include "gimplify.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "ssa.h"
#include "tree-ssa-propagate.h"
#include "builtins.h"
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 5cb8a53e9ce6f4d9ead1ca413b07f86caaec4877..d4defc855d0268ae543d125afb76e86809292c64 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -58,8 +58,8 @@
#include "reload.h"
#include "sched-int.h"
#include "gimplify.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "gimple-walk.h"
#include "ssa.h"
#include "tree-vectorizer.h"
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index 7c3bd6cbe7f8c0f85b06d362e85e8e558c7d1977..45bbb6c3d70ab1b5faf3e15852c2ec31d0de3863 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -70,6 +70,7 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "langhooks.h"
#include "internal-fn.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index e560d842e8c03e7ac594456913be5d4789b33663..433fa767c0369e011907f8080b6f711eb07e385c 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "builtins.h"
#include "tree-inline.h"
#include "ubsan.h"
-#include "gimple-fold.h"
#include "timevar.h"
#include "fold-const-call.h"
#include "stor-layout.h"
diff --git a/gcc/expr.cc b/gcc/expr.cc
index 5f7142b975ada2cd8b00663d35ba1e0004b8e28d..18060911793796461c67027c691f28f0ff912953 100644
--- a/gcc/expr.cc
+++ b/gcc/expr.cc
@@ -60,6 +60,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-address.h"
#include "builtins.h"
#include "ccmp.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "rtx-vector-builder.h"
#include "tree-pretty-print.h"
diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc
index a57ad0739fb02d63e65ff9fedf65fa9c4004f4fe..7bf12315293383a86f78fa783b9fd52fcf3d92e9 100644
--- a/gcc/fold-const.cc
+++ b/gcc/fold-const.cc
@@ -70,6 +70,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "builtins.h"
#include "generic-match.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-into-ssa.h"
#include "md5.h"
diff --git a/gcc/fold-const.h b/gcc/fold-const.h
index a4ff55418a5db55ac28c6816b1728bce1de32d7a..fe78a4d0a581d1374e213e604186cb6d9bc37714 100644
--- a/gcc/fold-const.h
+++ b/gcc/fold-const.h
@@ -245,6 +245,11 @@ extern tree fold_build_pointer_plus_hwi_loc (location_t loc, tree ptr, HOST_WIDE
#define fold_build_pointer_plus_hwi(p,o) \
fold_build_pointer_plus_hwi_loc (UNKNOWN_LOCATION, p, o)
+/* In gimple-fold.cc. */
+extern void clear_type_padding_in_mask (tree, unsigned char *);
+extern bool clear_padding_type_may_have_padding_p (tree);
+extern bool arith_overflowed_p (enum tree_code, const_tree, const_tree,
+ const_tree);
/* Class used to compare gimple operands. */
diff --git a/gcc/function-tests.cc b/gcc/function-tests.cc
index 7d7761569ad59a6c195fcf4cf62a98c38e2a5772..1f983e870324e6cd5ff8197a3bf0a72e09e99326 100644
--- a/gcc/function-tests.cc
+++ b/gcc/function-tests.cc
@@ -47,6 +47,8 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimple-expr.h"
#include "toplev.h"
@@ -67,7 +69,6 @@ along with GCC; see the file COPYING3. If not see
#include "internal-fn.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
#include "tree-pass.h"
#include "context.h"
#include "hash-map.h"
diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc
index e11da9e46d0ce96c088dae7eb6ec4160b5c22368..19676251fdbf98578d2a74f348d06041e43ab853 100644
--- a/gcc/gengtype.cc
+++ b/gcc/gengtype.cc
@@ -1703,9 +1703,9 @@ open_base_files (void)
"alias.h", "insn-config.h", "flags.h", "expmed.h", "dojump.h",
"explow.h", "calls.h", "memmodel.h", "emit-rtl.h", "varasm.h",
"stmt.h", "expr.h", "alloc-pool.h", "cselib.h", "insn-addr.h",
- "optabs.h", "libfuncs.h", "debug.h", "internal-fn.h", "gimple-fold.h",
- "value-range.h",
- "tree-eh.h", "gimple-iterator.h", "gimple-ssa.h", "tree-cfg.h",
+ "optabs.h", "libfuncs.h", "debug.h", "internal-fn.h",
+ "gimple-iterator.h", "gimple-fold.h", "value-range.h",
+ "tree-eh.h", "gimple-ssa.h", "tree-cfg.h",
"tree-vrp.h", "tree-phinodes.h", "ssa-iterators.h", "stringpool.h",
"tree-ssanames.h", "tree-ssa-loop.h", "tree-ssa-loop-ivopts.h",
"tree-ssa-loop-manip.h", "tree-ssa-loop-niter.h", "tree-into-ssa.h",
diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc
index 7baec119ba35cc95cca5e05e591bb390769dc403..e086b0310ef53c5a0f4372596049c3dafd2362fe 100644
--- a/gcc/gimple-fold.cc
+++ b/gcc/gimple-fold.cc
@@ -37,9 +37,9 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "stor-layout.h"
#include "dumpfile.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
#include "tree-object-size.h"
@@ -8669,14 +8669,23 @@ gimple_build_valueize (tree op)
/* Build the expression CODE OP0 of type TYPE with location LOC,
simplifying it first if possible. Returns the built
- expression value and appends statements possibly defining it
- to SEQ. */
+ expression value and inserts statements possibly defining it
+ before GSI if BEFORE is true or after GSI if false and advance
+ the iterator accordingly.
+ If gsi refers to a basic block simplifying is allowed to look
+ at all SSA defs while when it does not it is restricted to
+ SSA defs that are not associated with a basic block yet,
+ indicating they belong to the currently building sequence. */
tree
-gimple_build (gimple_seq *seq, location_t loc,
- enum tree_code code, tree type, tree op0)
+gimple_build (gimple_stmt_iterator *gsi,
+ bool before, gsi_iterator_update update,
+ location_t loc, enum tree_code code, tree type, tree op0)
{
- tree res = gimple_simplify (code, type, op0, seq, gimple_build_valueize);
+ gimple_seq seq = NULL;
+ tree res
+ = gimple_simplify (code, type, op0, &seq,
+ gsi->bb ? follow_all_ssa_edges : gimple_build_valueize);
if (!res)
{
res = create_tmp_reg_or_ssa_name (type);
@@ -8688,7 +8697,21 @@ gimple_build (gimple_seq *seq, location_t loc,
else
stmt = gimple_build_assign (res, code, op0);
gimple_set_location (stmt, loc);
- gimple_seq_add_stmt_without_update (seq, stmt);
+ gimple_seq_add_stmt_without_update (&seq, stmt);
+ }
+ if (before)
+ {
+ if (gsi->bb)
+ gsi_insert_seq_before (gsi, seq, update);
+ else
+ gsi_insert_seq_before_without_update (gsi, seq, update);
+ }
+ else
+ {
+ if (gsi->bb)
+ gsi_insert_seq_after (gsi, seq, update);
+ else
+ gsi_insert_seq_after_without_update (gsi, seq, update);
}
return res;
}
@@ -8699,16 +8722,35 @@ gimple_build (gimple_seq *seq, location_t loc,
to SEQ. */
tree
-gimple_build (gimple_seq *seq, location_t loc,
- enum tree_code code, tree type, tree op0, tree op1)
+gimple_build (gimple_stmt_iterator *gsi,
+ bool before, gsi_iterator_update update,
+ location_t loc, enum tree_code code, tree type,
+ tree op0, tree op1)
{
- tree res = gimple_simplify (code, type, op0, op1, seq, gimple_build_valueize);
+ gimple_seq seq = NULL;
+ tree res
+ = gimple_simplify (code, type, op0, op1, &seq,
+ gsi->bb ? follow_all_ssa_edges : gimple_build_valueize);
if (!res)
{
res = create_tmp_reg_or_ssa_name (type);
gimple *stmt = gimple_build_assign (res, code, op0, op1);
gimple_set_location (stmt, loc);
- gimple_seq_add_stmt_without_update (seq, stmt);
+ gimple_seq_add_stmt_without_update (&seq, stmt);
+ }
+ if (before)
+ {
+ if (gsi->bb)
+ gsi_insert_seq_before (gsi, seq, update);
+ else
+ gsi_insert_seq_before_without_update (gsi, seq, update);
+ }
+ else
+ {
+ if (gsi->bb)
+ gsi_insert_seq_after (gsi, seq, update);
+ else
+ gsi_insert_seq_after_without_update (gsi, seq, update);
}
return res;
}
@@ -8719,11 +8761,16 @@ gimple_build (gimple_seq *seq, location_t loc,
to SEQ. */
tree
-gimple_build (gimple_seq *seq, location_t loc,
- enum tree_code code, tree type, tree op0, tree op1, tree op2)
+gimple_build (gimple_stmt_iterator *gsi,
+ bool before, gsi_iterator_update update,
+ location_t loc, enum tree_code code, tree type,
+ tree op0, tree op1, tree op2)
{
- tree res = gimple_simplify (code, type, op0, op1, op2,
- seq, gimple_build_valueize);
+
+ gimple_seq seq = NULL;
+ tree res
+ = gimple_simplify (code, type, op0, op1, op2, &seq,
+ gsi->bb ? follow_all_ssa_edges : gimple_build_valueize);
if (!res)
{
res = create_tmp_reg_or_ssa_name (type);
@@ -8734,7 +8781,21 @@ gimple_build (gimple_seq *seq, location_t loc,
else
stmt = gimple_build_assign (res, code, op0, op1, op2);
gimple_set_location (stmt, loc);
- gimple_seq_add_stmt_without_update (seq, stmt);
+ gimple_seq_add_stmt_without_update (&seq, stmt);
+ }
+ if (before)
+ {
+ if (gsi->bb)
+ gsi_insert_seq_before (gsi, seq, update);
+ else
+ gsi_insert_seq_before_without_update (gsi, seq, update);
+ }
+ else
+ {
+ if (gsi->bb)
+ gsi_insert_seq_after (gsi, seq, update);
+ else
+ gsi_insert_seq_after_without_update (gsi, seq, update);
}
return res;
}
diff --git a/gcc/gimple-fold.h b/gcc/gimple-fold.h
index 850f917bbc1a2a0a99d055840fad1249e9d4a2dc..520fde861e316b0c0151382759936484e01095b6 100644
--- a/gcc/gimple-fold.h
+++ b/gcc/gimple-fold.h
@@ -38,12 +38,8 @@ extern tree maybe_fold_and_comparisons (tree, enum tree_code, tree, tree,
extern tree maybe_fold_or_comparisons (tree, enum tree_code, tree, tree,
enum tree_code, tree, tree,
basic_block = nullptr);
-extern bool clear_padding_type_may_have_padding_p (tree);
-extern void clear_type_padding_in_mask (tree, unsigned char *);
extern bool optimize_atomic_compare_exchange_p (gimple *);
extern void fold_builtin_atomic_compare_exchange (gimple_stmt_iterator *);
-extern bool arith_overflowed_p (enum tree_code, const_tree, const_tree,
- const_tree);
extern tree no_follow_ssa_edges (tree);
extern tree follow_single_use_edges (tree);
extern tree follow_all_ssa_edges (tree);
@@ -71,19 +67,35 @@ extern tree tree_vec_extract (gimple_stmt_iterator *, tree, tree, tree, tree);
/* gimple_build, functionally matching fold_buildN, outputs stmts
int the provided sequence, matching and simplifying them on-the-fly.
Supposed to replace force_gimple_operand (fold_buildN (...), ...). */
-extern tree gimple_build (gimple_seq *, location_t,
- enum tree_code, tree, tree);
-extern tree gimple_build (gimple_seq *, location_t,
- enum tree_code, tree, tree, tree);
-extern tree gimple_build (gimple_seq *, location_t,
- enum tree_code, tree, tree, tree, tree);
+extern tree gimple_build (gimple_stmt_iterator *, bool,
+ enum gsi_iterator_update,
+ location_t, enum tree_code, tree, tree);
+extern tree gimple_build (gimple_stmt_iterator *, bool,
+ enum gsi_iterator_update,
+ location_t, enum tree_code, tree, tree, tree);
+extern tree gimple_build (gimple_stmt_iterator *, bool,
+ enum gsi_iterator_update,
+ location_t, enum tree_code, tree, tree, tree, tree);
+template<class ...Args>
+inline tree
+gimple_build (gimple_seq *seq, location_t loc,
+ enum tree_code code, tree type, Args ...ops)
+{
+ static_assert (sizeof...(ops) > 0 && sizeof...(ops) <= 3,
+ "Number of operands must be from one to three");
+ gimple_stmt_iterator gsi = gsi_last (*seq);
+ return gimple_build (&gsi, false, GSI_CONTINUE_LINKING,
+ loc, code, type, ops...);
+}
template<class ...Args>
inline tree
gimple_build (gimple_seq *seq, enum tree_code code, tree type, Args ...ops)
{
static_assert (sizeof...(ops) > 0 && sizeof...(ops) <= 3,
"Number of operands must be from one to three");
- return gimple_build (seq, UNKNOWN_LOCATION, code, type, ops...);
+ gimple_stmt_iterator gsi = gsi_last (*seq);
+ return gimple_build (&gsi, false, GSI_CONTINUE_LINKING,
+ UNKNOWN_LOCATION, code, type, ops...);
}
extern tree gimple_build (gimple_seq *, location_t, combined_fn, tree);
diff --git a/gcc/gimple-match-head.cc b/gcc/gimple-match-head.cc
index 1c74d38088fc549b0f4a39d4c7e046bf06f5256a..4c80d77f8ba23b9ce8b67913c2238ff65b291906 100644
--- a/gcc/gimple-match-head.cc
+++ b/gcc/gimple-match-head.cc
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3. If not see
#include "fold-const.h"
#include "fold-const-call.h"
#include "stor-layout.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "calls.h"
#include "tree-dfa.h"
diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
index 3169e29b5deb293d687380b223a6c8af64866e20..08d791a041826de2cc255c676a6370a216b27ec4 100644
--- a/gcc/gimple-range-fold.cc
+++ b/gcc/gimple-range-fold.cc
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "ssa.h"
#include "gimple-pretty-print.h"
#include "optabs-tree.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "wide-int.h"
#include "fold-const.h"
diff --git a/gcc/gimple-ssa-evrp-analyze.cc b/gcc/gimple-ssa-evrp-analyze.cc
index fec6e87ba80d6f7dbf6d04ba848dd53d3e4d4574..16e5a75b1db4ca28be524f7c27a47c6fa4f4021f 100644
--- a/gcc/gimple-ssa-evrp-analyze.cc
+++ b/gcc/gimple-ssa-evrp-analyze.cc
@@ -27,9 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "ssa.h"
#include "gimple-pretty-print.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/gimple-ssa-evrp.cc b/gcc/gimple-ssa-evrp.cc
index 2baaed6d978cbea9967f457503a8ca73ab514a26..92dbdd5df95a3aac1f842f178d57d744d28237a8 100644
--- a/gcc/gimple-ssa-evrp.cc
+++ b/gcc/gimple-ssa-evrp.cc
@@ -27,9 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "ssa.h"
#include "gimple-pretty-print.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/gimple-ssa-sprintf.cc b/gcc/gimple-ssa-sprintf.cc
index 9a84fffed1aa255cbe50ce0ee8765c4ebfd35012..961c1b739dad30b90e3b06fd987e9f1e1eaef7e5 100644
--- a/gcc/gimple-ssa-sprintf.cc
+++ b/gcc/gimple-ssa-sprintf.cc
@@ -53,11 +53,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-pass.h"
#include "ssa.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimple-pretty-print.h"
#include "diagnostic-core.h"
#include "fold-const.h"
-#include "gimple-iterator.h"
#include "tree-ssa.h"
#include "tree-object-size.h"
#include "tree-cfg.h"
diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc
index 39aa8186de6f08d493b3c295e881d1e0a89dccb1..c4204241c8ce073a5ee04130dbcd7690bb3cc6b6 100644
--- a/gcc/gimple-ssa-warn-access.cc
+++ b/gcc/gimple-ssa-warn-access.cc
@@ -36,8 +36,8 @@
#include "gimple-ssa-warn-restrict.h"
#include "diagnostic-core.h"
#include "fold-const.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "langhooks.h"
#include "memmodel.h"
#include "target.h"
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index 13413d019c4be8c0550225f5f205dfb51fe2ff38..2f6d995c385810fe7c3c5d35be028de99ef24411 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -42,10 +42,10 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "stor-layout.h"
#include "print-tree.h"
#include "tree-iterator.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.cc b/gcc/graphite-isl-ast-to-gimple.cc
index ea1129f0da3366532166ac4709c254743866d3a1..45ed77048071909f174531781bbb166604211e9e 100644
--- a/gcc/graphite-isl-ast-to-gimple.cc
+++ b/gcc/graphite-isl-ast-to-gimple.cc
@@ -32,8 +32,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "ssa.h"
#include "fold-const.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "gimplify.h"
#include "gimplify-me.h"
#include "tree-eh.h"
diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc
index 11f4a327b99fbc1de3f6634ea9a8149019894c29..152fe7244f7b216f4f2aa5558253db9845787022 100644
--- a/gcc/ipa-cp.cc
+++ b/gcc/ipa-cp.cc
@@ -113,6 +113,7 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "diagnostic.h"
#include "fold-const.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "symbol-summary.h"
#include "tree-vrp.h"
diff --git a/gcc/ipa-devirt.cc b/gcc/ipa-devirt.cc
index 6cba2085f1ae5c7d773207ff217825d42507a14d..9f1442dc3cc198d9d117d20bd0c603e42c2d00d6 100644
--- a/gcc/ipa-devirt.cc
+++ b/gcc/ipa-devirt.cc
@@ -120,6 +120,7 @@ along with GCC; see the file COPYING3. If not see
#include "print-tree.h"
#include "calls.h"
#include "ipa-utils.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "symbol-summary.h"
#include "tree-vrp.h"
diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc
index 80e67e93e12439a6960736b81502f7bfd619a7c7..c6c745f84a0863504f4ca4c537817098616c1de1 100644
--- a/gcc/ipa-prop.cc
+++ b/gcc/ipa-prop.cc
@@ -31,13 +31,13 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "diagnostic.h"
#include "fold-const.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "calls.h"
#include "stor-layout.h"
#include "print-tree.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "symbol-summary.h"
diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index e7818a9af5f8f9e70e225919a9a4f56b2950e7cf..8aebaeecd4201dcbef20952ab1827be68ab9d7e0 100644
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -37,9 +37,9 @@ along with GCC; see the file COPYING3. If not see
#include "fold-const.h"
#include "stor-layout.h"
#include "internal-fn.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "tree-iterator.h"
diff --git a/gcc/pointer-query.cc b/gcc/pointer-query.cc
index d93657f32064b41a1da269a6e9c1e67edb6781cc..646606e6344967e8dfb2ac4246a0b2cbd49b9dfe 100644
--- a/gcc/pointer-query.cc
+++ b/gcc/pointer-query.cc
@@ -33,6 +33,7 @@
#include "langhooks.h"
#include "stringpool.h"
#include "attribs.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimple-ssa.h"
#include "intl.h"
diff --git a/gcc/range-op.cc b/gcc/range-op.cc
index 47c6dff8f3ee835d816ea72c5a798746284b2451..eaa02309d7070a152470b331c243875557920ca2 100644
--- a/gcc/range-op.cc
+++ b/gcc/range-op.cc
@@ -38,9 +38,9 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "calls.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "tree-cfg.h"
#include "wide-int.h"
diff --git a/gcc/testsuite/g++.dg/plugin/selfassign.c b/gcc/testsuite/g++.dg/plugin/selfassign.c
index 2c60c1810de941e237456c64b046452700c28594..fd78f574307f2321e48c9bd3f2b05a38b4852f31 100644
--- a/gcc/testsuite/g++.dg/plugin/selfassign.c
+++ b/gcc/testsuite/g++.dg/plugin/selfassign.c
@@ -17,12 +17,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_group_plugin.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_group_plugin.c
index 67ca701adfab765a7d0e2d7ac0476acd4ccf43c7..3396b384163efebc0c35bba32f834a57127644d8 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_group_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_group_plugin.c
@@ -15,12 +15,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c
index ac72503d92e3f84918cdec17e71d7ecca624c13d..d81fa571c97514ddb507db91d66ef2939aa6474a 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c
@@ -17,12 +17,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c
index d2bfca092a79f77e21dd9fab18594665eb3496e8..3627f7a2b7f07ef03f66ea570e080be165579893 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c
@@ -15,12 +15,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_metadata.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_metadata.c
index a6108919b241582c9679637e28e13a31957ae84f..4b13afc093d589c0be1e031e01c13238749c721b 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_metadata.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_metadata.c
@@ -15,12 +15,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c
index 5c2da021553bce39ab593b1fcf6bd4caabac26e4..8d97fe8e8d951746bb58e24c709124b866e4e314 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c
@@ -21,12 +21,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_show_locus.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
index 482dbda47f73c4230f185b717dd1eea33145f616..baa6b629b83fa920ba3cc0f96a34937c2a36b0d1 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
@@ -47,12 +47,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c
index aa73dcae8201252daf6918dacd33a05a13c69692..0269f728a93300db51278aeede06f7b09a224892 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c
@@ -17,12 +17,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c
index 4a89d846dcee4177fee923c63218d873a2c9810f..f5468636e06db77e1d47cc18203d4d3434a2b94f 100644
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c
@@ -17,12 +17,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c b/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c
index 1b4f7cc26fc0f21c442de09345f42e1ee5b0918c..05e188165bf4537c3aa240337e9feed12ec71eaf 100644
--- a/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c
@@ -15,7 +15,6 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/ggcplug.c b/gcc/testsuite/gcc.dg/plugin/ggcplug.c
index c186d119371db98322d6f5934e17cbf064daf9d8..a75eed0e39852a8602b7fabcd05057009772663f 100644
--- a/gcc/testsuite/gcc.dg/plugin/ggcplug.c
+++ b/gcc/testsuite/gcc.dg/plugin/ggcplug.c
@@ -14,7 +14,6 @@
#include "ggc.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/must_tail_call_plugin.c b/gcc/testsuite/gcc.dg/plugin/must_tail_call_plugin.c
index 5294f28abbc44697c752e53703afb9585bbe5f2b..0c040e54252b2b7cc8c128f52438540913ce4acd 100644
--- a/gcc/testsuite/gcc.dg/plugin/must_tail_call_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/must_tail_call_plugin.c
@@ -17,7 +17,6 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c b/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
index bd1c0f0e57948e995f1b63d89be12a3512701926..84f2d31f0f219667583f10cfde61454c3f0c5497 100644
--- a/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
@@ -12,7 +12,6 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/selfassign.c b/gcc/testsuite/gcc.dg/plugin/selfassign.c
index 2adb6446b1dbadd8e0a81914b5234685e126d0ce..13b3ecaa0f2ddc37c9d475718ae890362b7a9851 100644
--- a/gcc/testsuite/gcc.dg/plugin/selfassign.c
+++ b/gcc/testsuite/gcc.dg/plugin/selfassign.c
@@ -17,12 +17,12 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
-#include "gimple.h"
-#include "gimple-iterator.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c b/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c
index 61e9494038c7b574c34a7b06e29c669e21dd0503..7b4f40e0e9df8a9b97d7d2f832c4c5913f018903 100644
--- a/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c
@@ -20,7 +20,6 @@
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
#include "is-a.h"
diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index e321d929fd0cd3dfe81b079674ece6d98f9c5af1..19ba09facce24ea7241d1bf557804c1bb509f410 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -37,9 +37,9 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "print-tree.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "tree-cfg.h"
diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc
index 57cc38567d340b9e3c2c2f1efaa219f20f7872e8..4531ca58bdf51d5ae6e6a0c2a121616542b24f48 100644
--- a/gcc/tree-if-conv.cc
+++ b/gcc/tree-if-conv.cc
@@ -96,9 +96,9 @@ along with GCC; see the file COPYING3. If not see
#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "tree-cfg.h"
#include "tree-into-ssa.h"
diff --git a/gcc/tree-inline.cc b/gcc/tree-inline.cc
index 29bb758b7bcfb2606264acc30eb1aa5a2c25e07f..043e1d5987a4c4b0159109dafb85a805ca828c1e 100644
--- a/gcc/tree-inline.cc
+++ b/gcc/tree-inline.cc
@@ -41,10 +41,10 @@ along with GCC; see the file COPYING3. If not see
#include "cfganal.h"
#include "tree-iterator.h"
#include "intl.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "tree-cfg.h"
diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc
index fc062b94d7628d139fea8f9abce4a1e7517d779d..5ca87ae350427bd0425319de0b789b8fd9a9cd05 100644
--- a/gcc/tree-object-size.cc
+++ b/gcc/tree-object-size.cc
@@ -29,8 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "fold-const.h"
#include "tree-object-size.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "tree-cfg.h"
#include "tree-dfa.h"
#include "stringpool.h"
diff --git a/gcc/tree-ssa-ccp.cc b/gcc/tree-ssa-ccp.cc
index 9164efe30370199c7a2b972593336508d287c35f..262a247eac50a8026e9f3c4441282090f1795d39 100644
--- a/gcc/tree-ssa-ccp.cc
+++ b/gcc/tree-ssa-ccp.cc
@@ -129,10 +129,10 @@ along with GCC; see the file COPYING3. If not see
#include "ssa.h"
#include "gimple-pretty-print.h"
#include "fold-const.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa-propagate.h"
#include "dbgcnt.h"
diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc
index 89b05171d57c6a15647dee4aade44c8c80b9a705..9a843217553b9d51336d961879ad96fda06030db 100644
--- a/gcc/tree-ssa-dom.cc
+++ b/gcc/tree-ssa-dom.cc
@@ -30,10 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "fold-const.h"
#include "cfganal.h"
#include "cfgloop.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "tree-inline.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-into-ssa.h"
#include "domwalk.h"
diff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc
index c5b2a4f9f42d1cea0e42f16e30a9bbe2403faabe..48cab5844e0ae731f0e74122b53be8ecbb729cfa 100644
--- a/gcc/tree-ssa-forwprop.cc
+++ b/gcc/tree-ssa-forwprop.cc
@@ -32,10 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "fold-const.h"
#include "stor-layout.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "tree-cfg.h"
#include "expr.h"
diff --git a/gcc/tree-ssa-ifcombine.cc b/gcc/tree-ssa-ifcombine.cc
index cb86cc1ea5fe742c5c58433a38482163542ced52..88a9f062dcdf5f2806340df413fa269e3b9b9471 100644
--- a/gcc/tree-ssa-ifcombine.cc
+++ b/gcc/tree-ssa-ifcombine.cc
@@ -35,8 +35,8 @@ along with GCC; see the file COPYING3. If not see
BRANCH_COST. */
#include "fold-const.h"
#include "cfganal.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "gimplify-me.h"
#include "tree-cfg.h"
#include "tree-ssa.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.cc b/gcc/tree-ssa-loop-ivcanon.cc
index e2ac20447410d8e730fa38222964e729147cab32..2ee00a3f843724d7d57664c0b904ec83ea5d4c12 100644
--- a/gcc/tree-ssa-loop-ivcanon.cc
+++ b/gcc/tree-ssa-loop-ivcanon.cc
@@ -48,9 +48,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "fold-const.h"
#include "profile.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
diff --git a/gcc/tree-ssa-math-opts.cc b/gcc/tree-ssa-math-opts.cc
index 2085597447ef9956491feb5376ebeb3c0369898b..ce1df01f629afa044fb7666ca73a9331ce268b51 100644
--- a/gcc/tree-ssa-math-opts.cc
+++ b/gcc/tree-ssa-math-opts.cc
@@ -100,8 +100,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "alias.h"
#include "fold-const.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "gimplify.h"
#include "gimplify-me.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-pre.cc b/gcc/tree-ssa-pre.cc
index a578ce6dfa495c89a27bfd09ce207b1235097977..34d77f1e2cf813a93bf2168cb982437b1d100ab7 100644
--- a/gcc/tree-ssa-pre.cc
+++ b/gcc/tree-ssa-pre.cc
@@ -34,10 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "fold-const.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
diff --git a/gcc/tree-ssa-propagate.cc b/gcc/tree-ssa-propagate.cc
index 7813e511379c3755f81ef76fffebb59cf778e7fd..c10ffd91766adc934a37dfdbd0b1415f4fb31a60 100644
--- a/gcc/tree-ssa-propagate.cc
+++ b/gcc/tree-ssa-propagate.cc
@@ -27,10 +27,10 @@
#include "ssa.h"
#include "gimple-pretty-print.h"
#include "dumpfile.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc
index 43b25371d4b02c6e3410783f856db394f8a9738b..406523b5d2f808f07db656aac8779ec0f9e3d7a1 100644
--- a/gcc/tree-ssa-reassoc.cc
+++ b/gcc/tree-ssa-reassoc.cc
@@ -38,9 +38,9 @@ along with GCC; see the file COPYING3. If not see
#include "fold-const.h"
#include "stor-layout.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "tree-cfg.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc
index f1bc372f81a31da4d8393b2bc618fb1f51e86d22..ed68557f0b23b5532544a2755a1261786f3ea32e 100644
--- a/gcc/tree-ssa-sccvn.cc
+++ b/gcc/tree-ssa-sccvn.cc
@@ -39,6 +39,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfganal.h"
#include "tree-inline.h"
#include "internal-fn.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
@@ -56,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-propagate.h"
#include "tree-cfg.h"
#include "domwalk.h"
-#include "gimple-iterator.h"
#include "gimple-match.h"
#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/tree-ssa-strlen.cc b/gcc/tree-ssa-strlen.cc
index 1e5f911fedb226476b0a8f923a5e09d29777ff30..bb7fe0853ef26a6b7bca5d26e829bd6a945728ae 100644
--- a/gcc/tree-ssa-strlen.cc
+++ b/gcc/tree-ssa-strlen.cc
@@ -34,10 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-ssa-warn-restrict.h"
#include "fold-const.h"
#include "stor-layout.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "expr.h"
#include "tree-cfg.h"
diff --git a/gcc/tree-ssa.cc b/gcc/tree-ssa.cc
index a362a0a9ea63be609da459998045243c07cbc173..6507348e79374a3481f47037ad428ec7362d87b0 100644
--- a/gcc/tree-ssa.cc
+++ b/gcc/tree-ssa.cc
@@ -30,9 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "fold-const.h"
#include "stor-layout.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "gimplify.h"
-#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "tree-ssa-loop-manip.h"
#include "tree-into-ssa.h"
diff --git a/gcc/tree-vect-generic.cc b/gcc/tree-vect-generic.cc
index e5bd9dc7c76b7a6e5e01ac09b0fd84894c993c55..d99e3207fbe18e63b7a7407bf0ddfd2046869ce2 100644
--- a/gcc/tree-vect-generic.cc
+++ b/gcc/tree-vect-generic.cc
@@ -54,10 +54,7 @@ gimplify_build3 (gimple_stmt_iterator *gsi, enum tree_code code,
tree type, tree a, tree b, tree c)
{
location_t loc = gimple_location (gsi_stmt (*gsi));
- gimple_seq stmts = NULL;
- tree ret = gimple_build (&stmts, loc, code, type, a, b, c);
- gsi_insert_seq_before (gsi, stmts, GSI_SAME_STMT);
- return ret;
+ return gimple_build (gsi, true, GSI_SAME_STMT, loc, code, type, a, b, c);
}
/* Build a binary operation and gimplify it. Emit code before GSI.
@@ -68,10 +65,7 @@ gimplify_build2 (gimple_stmt_iterator *gsi, enum tree_code code,
tree type, tree a, tree b)
{
location_t loc = gimple_location (gsi_stmt (*gsi));
- gimple_seq stmts = NULL;
- tree ret = gimple_build (&stmts, loc, code, type, a, b);
- gsi_insert_seq_before (gsi, stmts, GSI_SAME_STMT);
- return ret;
+ return gimple_build (gsi, true, GSI_SAME_STMT, loc, code, type, a, b);
}
/* Build a unary operation and gimplify it. Emit code before GSI.
@@ -82,10 +76,7 @@ gimplify_build1 (gimple_stmt_iterator *gsi, enum tree_code code, tree type,
tree a)
{
location_t loc = gimple_location (gsi_stmt (*gsi));
- gimple_seq stmts = NULL;
- tree ret = gimple_build (&stmts, loc, code, type, a);
- gsi_insert_seq_before (gsi, stmts, GSI_SAME_STMT);
- return ret;
+ return gimple_build (gsi, true, GSI_SAME_STMT, loc, code, type, a);
}
diff --git a/gcc/ubsan.cc b/gcc/ubsan.cc
index f74929d0f17d40bbedb1af81bb874824189126bc..6c058142c373afe8386a2e8392cdb5e611d95adf 100644
--- a/gcc/ubsan.cc
+++ b/gcc/ubsan.cc
@@ -1184,12 +1184,9 @@ ubsan_expand_ptr_ifn (gimple_stmt_iterator *gsip)
gimple_set_location (g, loc);
gsi_insert_after (&gsi2, g, GSI_NEW_STMT);
- gimple_seq seq = NULL;
- tree t = gimple_build (&seq, loc, NOP_EXPR, ssizetype, off);
- t = gimple_build (&seq, loc, GE_EXPR, boolean_type_node,
- t, ssize_int (0));
- gsi_insert_seq_before (&gsi, seq, GSI_SAME_STMT);
- g = gimple_build_cond (NE_EXPR, t, boolean_false_node,
+ tree t = gimple_build (&gsi, true, GSI_SAME_STMT,
+ loc, NOP_EXPR, ssizetype, off);
+ g = gimple_build_cond (GE_EXPR, t, ssize_int (0),
NULL_TREE, NULL_TREE);
}
gimple_set_location (g, loc);
diff --git a/gcc/value-pointer-equiv.cc b/gcc/value-pointer-equiv.cc
index f2d95c4393eee23e8951ac86447746adfb8ea238..b768ecda11aea04c04ca058109d15966b90ae4bb 100644
--- a/gcc/value-pointer-equiv.cc
+++ b/gcc/value-pointer-equiv.cc
@@ -28,9 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "ssa.h"
#include "gimple-pretty-print.h"
#include "cfganal.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc
index 301996d213474c7d42a78512614a4f87707a5832..2cc5084c15a2b3411d44567131aa611d6c82f192 100644
--- a/gcc/vr-values.cc
+++ b/gcc/vr-values.cc
@@ -32,8 +32,8 @@ along with GCC; see the file COPYING3. If not see
#include "fold-const.h"
#include "calls.h"
#include "cfganal.h"
-#include "gimple-fold.h"
#include "gimple-iterator.h"
+#include "gimple-fold.h"
#include "tree-cfg.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"