nir: properly find the entry to keep in copy_prop_vars
authorCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Sat, 15 Dec 2018 00:10:32 +0000 (16:10 -0800)
committerCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Wed, 19 Dec 2018 17:33:36 +0000 (09:33 -0800)
commit947f7b452a550c66cfb9a8c9518e35635eb25947
tree952302c5c33db3b7f1ac2f77d2d8ad6410bbce27
parent9d8395bf0e4bfa6ef1344dbc9aebcf183aa9f9b5
nir: properly find the entry to keep in copy_prop_vars

When copy propagation handles a store/copy, it iterates the current
copy entries to remove aliases, but keeps the "equal" entry (if
exists) to be updated.

The removal step may swap the entries around (to ensure there are no
holes), invalidating previous iteration pointers.  The bug was saving
such pointer to use later.  Change the code to first perform the
removals and then find the remaining right entry.

This was causing updates to be lost since they were being made to an
entry that was not part of the current copies.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108624
Fixes: b3c61469255 "nir: Copy propagation between blocks"
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/compiler/nir/nir_opt_copy_prop_vars.c