diff options
| author | Andrew Pinski <quic_apinski@quicinc.com> | 2024-09-11 22:10:53 -0700 |
|---|---|---|
| committer | Andrew Pinski <quic_apinski@quicinc.com> | 2024-09-13 09:31:06 -0700 |
| commit | 8ed8c342fba682286159f56d0e53a05db95762a0 (patch) | |
| tree | 2d13e1fc8225056ca7ff5a0c3f55473bf3a16aed | |
| parent | b55f5e344c9b2f3667ef176e090c168e0add41f1 (diff) | |
| download | gcc-8ed8c342fba682286159f56d0e53a05db95762a0.zip gcc-8ed8c342fba682286159f56d0e53a05db95762a0.tar.gz gcc-8ed8c342fba682286159f56d0e53a05db95762a0.tar.bz2 | |
Fix factor_out_conditional_operation heuristics for constants
While working on a different patch, I noticed the heuristics were not
doing the right thing if there was statements before the NOP/PREDICTs.
(LABELS don't have other statements before them).
This fixes that oversight which was added in r15-3334-gceda727dafba6e.
Bootstrapped and tested on x86_64-linux-gnu.
gcc/ChangeLog:
* tree-ssa-phiopt.cc (factor_out_conditional_operation): Instead
of just ignorning a NOP/PREDICT, skip over them before checking
the heuristics.
Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
| -rw-r--r-- | gcc/tree-ssa-phiopt.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc index 5710bc3..e5413e4 100644 --- a/gcc/tree-ssa-phiopt.cc +++ b/gcc/tree-ssa-phiopt.cc @@ -332,15 +332,17 @@ factor_out_conditional_operation (edge e0, edge e1, gphi *phi, { gsi = gsi_for_stmt (arg0_def_stmt); gsi_prev_nondebug (&gsi); + /* Ignore nops, predicates and labels. */ + while (!gsi_end_p (gsi) + && (gimple_code (gsi_stmt (gsi)) == GIMPLE_NOP + || gimple_code (gsi_stmt (gsi)) == GIMPLE_PREDICT + || gimple_code (gsi_stmt (gsi)) == GIMPLE_LABEL)) + gsi_prev_nondebug (&gsi); + if (!gsi_end_p (gsi)) { gimple *stmt = gsi_stmt (gsi); - /* Ignore nops, predicates and labels. */ - if (gimple_code (stmt) == GIMPLE_NOP - || gimple_code (stmt) == GIMPLE_PREDICT - || gimple_code (stmt) == GIMPLE_LABEL) - ; - else if (gassign *assign = dyn_cast <gassign *> (stmt)) + if (gassign *assign = dyn_cast <gassign *> (stmt)) { tree lhs = gimple_assign_lhs (assign); enum tree_code ass_code |