From b39ee4d7669c93fcb52ec570faaca2a4736ec886 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 13 Jan 2024 21:06:38 -0800 Subject: [PATCH] intel/disasm: Remove duplicate variable reg_file Fix defects reported by Coverity Scan. Evaluation order violation (EVALUATION_ORDER) write_write_typo: In reg_file = reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst), reg_file is written twice with the same value. Fixes: 1c92dad5cb7 ("intel/disasm: Disassembly support for DPAS") Signed-off-by: Vinson Lee Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 73835874a82f741e10cbc8da9128a4f5cd46e347) --- .pick_status.json | 2 +- src/intel/compiler/brw_disasm.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a769ba3ab20..14e6e861547 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -34,7 +34,7 @@ "description": "intel/disasm: Remove duplicate variable reg_file", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1c92dad5cb7f5d46dfaf56d2f9ce0203c2fbefbe", "notes": null diff --git a/src/intel/compiler/brw_disasm.c b/src/intel/compiler/brw_disasm.c index 02c7eaa79e4..3ef20f24675 100644 --- a/src/intel/compiler/brw_disasm.c +++ b/src/intel/compiler/brw_disasm.c @@ -1055,8 +1055,7 @@ static int dest_dpas_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst) { - uint32_t reg_file = - reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst); + uint32_t reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst); if (reg(file, reg_file, brw_inst_dpas_3src_dst_reg_nr(devinfo, inst)) == -1) return 0; @@ -1551,8 +1550,7 @@ static int src0_dpas_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst) { - uint32_t reg_file = - reg_file = brw_inst_dpas_3src_src0_reg_file(devinfo, inst); + uint32_t reg_file = brw_inst_dpas_3src_src0_reg_file(devinfo, inst); if (reg(file, reg_file, brw_inst_dpas_3src_src0_reg_nr(devinfo, inst)) == -1) return 0; @@ -1573,8 +1571,7 @@ static int src1_dpas_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst) { - uint32_t reg_file = - reg_file = brw_inst_dpas_3src_src1_reg_file(devinfo, inst); + uint32_t reg_file = brw_inst_dpas_3src_src1_reg_file(devinfo, inst); if (reg(file, reg_file, brw_inst_dpas_3src_src1_reg_nr(devinfo, inst)) == -1) return 0; @@ -1595,8 +1592,7 @@ static int src2_dpas_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst) { - uint32_t reg_file = - reg_file = brw_inst_dpas_3src_src2_reg_file(devinfo, inst); + uint32_t reg_file = brw_inst_dpas_3src_src2_reg_file(devinfo, inst); if (reg(file, reg_file, brw_inst_dpas_3src_src2_reg_nr(devinfo, inst)) == -1) return 0;