/*
* This file implements an optimization that deletes statically
- * unreachable/dead code. In NIR, one way this can happen if if an if
+ * unreachable/dead code. In NIR, one way this can happen is when an if
* statement has a constant condition:
*
* if (true) {
nir_phi_instr *phi = nir_instr_as_phi(instr);
nir_ssa_def *def = NULL;
- nir_foreach_phi_src(phi, phi_src) {
+ nir_foreach_phi_src(phi_src, phi) {
if (phi_src->pred != last_block)
continue;
: &if_stmt->else_list;
nir_cf_list list;
- nir_cf_extract(&list, nir_before_cf_list(cf_list),
- nir_after_cf_list(cf_list));
+ nir_cf_list_extract(&list, cf_list);
nir_cf_reinsert(&list, nir_after_cf_node(&if_stmt->cf_node));
nir_cf_node_remove(&if_stmt->cf_node);
}
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
- if (!nir_intrinsic_infos[intrin->intrinsic].flags &
- NIR_INTRINSIC_CAN_ELIMINATE)
+ if (!(nir_intrinsic_infos[intrin->intrinsic].flags &
+ NIR_INTRINSIC_CAN_ELIMINATE))
return true;
}
}
nir_metadata_require(impl, nir_metadata_live_ssa_defs |
nir_metadata_dominance);
- for (nir_block *cur = after->imm_dom; cur != before; cur = cur->imm_dom) {
+ for (nir_block *cur = after->imm_dom; cur && cur != before;
+ cur = cur->imm_dom) {
nir_foreach_instr(instr, cur) {
if (!nir_foreach_ssa_def(instr, def_not_live_out, after))
return false;
{
nir_if *following_if = nir_block_get_following_if(block);
if (following_if) {
- nir_const_value *const_value =
- nir_src_as_const_value(following_if->condition);
+ nir_const_value *const_value =
+ nir_src_as_const_value(following_if->condition);
- if (!const_value)
- return false;
+ if (!const_value)
+ return false;
opt_constant_if(following_if, const_value->u32[0] != 0);
return true;
{
bool progress = false;
- nir_foreach_function(shader, function)
+ nir_foreach_function(function, shader)
if (function->impl)
progress |= opt_dead_cf_impl(function->impl);