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

nir/gcm: fix a bug with metadata handling

Browse Source 
We were using impl->num_blocks, but that isn't guaranteed to be
up-to-date until after the block_index metadata is required. If we were
unlucky, this could lead to overwriting memory.

Noticed by inspection.

Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott
2017-01-14 18:08:11 -05:00
parent bf8e1f9e7b
commit c9b74f3f03
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_opt_gcm.c
View File

@@ -456,6 +456,9 @@ gcm_place_instr(nir_instr *instr, struct gcm_state *state)
static bool static bool
opt_gcm_impl(nir_function_impl *impl, bool value_number) opt_gcm_impl(nir_function_impl *impl, bool value_number)
{ {
nir_metadata_require(impl, nir_metadata_block_index |
nir_metadata_dominance);
struct gcm_state state; struct gcm_state state;
state.impl = impl; state.impl = impl;
@@ -463,9 +466,6 @@ opt_gcm_impl(nir_function_impl *impl, bool value_number)
exec_list_make_empty(&state.instrs); exec_list_make_empty(&state.instrs);
state.blocks = rzalloc_array(NULL, struct gcm_block_info, impl->num_blocks); state.blocks = rzalloc_array(NULL, struct gcm_block_info, impl->num_blocks);
nir_metadata_require(impl, nir_metadata_block_index |
nir_metadata_dominance);
gcm_build_block_info(&impl->body, &state, 0); gcm_build_block_info(&impl->body, &state, 0);
nir_foreach_block(block, impl) { nir_foreach_block(block, impl) {