diff options
-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 |