These 2 had simple resolvable conflicts when backporting. In the case of value_replacement, there was some minor code movement in value_replacement which needed to be resolved. In the case of PR117243, there was an extra include that was not on the branch.
Andrew Pinski (2): phiopt: Fix value_replacement for middle bb having phi nodes [PR118922] phiopt: Reset the number of iterations information of a loop when changing an exit from the loop [PR117243] gcc/testsuite/gcc.dg/torture/pr117243-1.c | 30 ++++++++++++ gcc/testsuite/gcc.dg/torture/pr117243-2.c | 34 ++++++++++++++ gcc/testsuite/gcc.dg/torture/pr118922-1.c | 57 +++++++++++++++++++++++ gcc/tree-ssa-phiopt.cc | 15 ++++++ 4 files changed, 136 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr117243-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr117243-2.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr118922-1.c -- 2.43.0