diff --git a/.pick_status.json b/.pick_status.json index ecd3cf8647b..32aa7952236 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2506,7 +2506,7 @@ "description": "aco/optimizer: don't copy-prop logical phis", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index 33310f2ea83..e1388ac0cf8 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -1373,7 +1373,6 @@ void label_instruction(opt_ctx &ctx, Block& block, aco_ptr& instr) instr->operands[1].isTemp() && ctx.info[instr->operands[1].tempId()].is_vcc()) ctx.info[instr->definitions[0].tempId()].set_temp(ctx.info[instr->operands[1].tempId()].temp); break; - case aco_opcode::p_phi: case aco_opcode::p_linear_phi: { /* lower_bool_phis() can create phis like this */ bool all_same_temp = instr->operands[0].isTemp();