OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Use nir_foreach_phi_src consistently.

Browse Source 
I copy-and-pasted one of these and people noted that we had a better tool,
so make sure nobody else copy and pastes it.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17664>
This commit is contained in:
Emma Anholt
2022-08-01 09:24:44 -07:00
committed by Marge Bot
parent a4bfe11a49
commit 31b9b04880
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir_clone.c
View File

@@ -449,7 +449,7 @@ clone_phi(clone_state *state, const nir_phi_instr *phi, nir_block *nblk)
*/ */
nir_instr_insert_after_block(nblk, &nphi->instr); nir_instr_insert_after_block(nblk, &nphi->instr);
foreach_list_typed(nir_phi_src, src, node, &phi->srcs) { nir_foreach_phi_src(src, phi) {
nir_phi_src *nsrc = nir_phi_instr_add_src(nphi, src->pred, src->src); nir_phi_src *nsrc = nir_phi_instr_add_src(nphi, src->pred, src->src);
/* Stash it in the list of phi sources. We'll walk this list and fix up /* Stash it in the list of phi sources. We'll walk this list and fix up

2
src/compiler/nir/nir_opt_if.c
View File

@@ -857,7 +857,7 @@ rewrite_phi_predecessor_blocks(nir_if *nif,
nir_phi_instr *phi = nir_instr_as_phi(instr); nir_phi_instr *phi = nir_instr_as_phi(instr);
foreach_list_typed(nir_phi_src, src, node, &phi->srcs) { nir_foreach_phi_src(src, phi) {
if (src->pred == old_then_block) { if (src->pred == old_then_block) {
src->pred = new_then_block; src->pred = new_then_block;
} else if (src->pred == old_else_block) { } else if (src->pred == old_else_block) {