wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Avoid referencing "ins" after insertion in vsir_program_materialise_phi_ssas_to_temps_in_function().

Browse Source
This commit is contained in:
Henri Verbeet
2025-10-15 15:49:45 +02:00
parent 27f0475dbe
commit 8df581b2d9
Notes: Henri Verbeet 2025-10-16 15:22:27 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1795
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/vkd3d-shader/ir.c
View File

@@ -5064,6 +5064,7 @@ static enum vkd3d_result vsir_program_materialise_phi_ssas_to_temps_in_function(
for (ins = vsir_program_iterator_current(it); ins; ins = vsir_program_iterator_next(it))
{
struct vkd3d_shader_instruction *mov_ins;
struct vkd3d_shader_location loc;
bool finish = false;
size_t j;
@@ -5083,6 +5084,7 @@ static enum vkd3d_result vsir_program_materialise_phi_ssas_to_temps_in_function(
case VSIR_OP_SWITCH_MONOLITHIC:
info = &block_info[current_label - 1];
loc = ins->location;
if (!(mov_ins = vsir_program_iterator_insert_before_and_move(it, info->incoming_count)))
goto fail;
VKD3D_ASSERT(mov_ins);
@@ -5091,7 +5093,7 @@ static enum vkd3d_result vsir_program_materialise_phi_ssas_to_temps_in_function(
{
struct phi_incoming_to_temp *incoming = &info->incomings[j];
if (!vsir_instruction_init_with_params(program, mov_ins, &ins->location, VSIR_OP_MOV, 1, 0))
if (!vsir_instruction_init_with_params(program, mov_ins, &loc, VSIR_OP_MOV, 1, 0))
{
vkd3d_shader_instruction_make_nop(mov_ins);
goto fail;