From 873365caeeb70ab14906d7b797ef0963fb8dcd73 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Sat, 10 Sep 2022 22:45:48 -0700 Subject: [PATCH] nouveau: Fix compiler warnings about silly address checks in ir_print. in/out/sv are arrays, so &array[i] is a non-null pointer. Presumably numSysVals/Inputs/Outputs are only incremented when there's data in the arrays, anyway. Reviewed-by: Karol Herbst Part-of: --- src/nouveau/codegen/nv50_ir_print.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/nouveau/codegen/nv50_ir_print.cpp b/src/nouveau/codegen/nv50_ir_print.cpp index bee37113936..aab61f301cc 100644 --- a/src/nouveau/codegen/nv50_ir_print.cpp +++ b/src/nouveau/codegen/nv50_ir_print.cpp @@ -955,30 +955,24 @@ nv50_ir_prog_info_out_print(struct nv50_ir_prog_info_out *info_out) if (info_out->numSysVals) { INFO(" \"sv\":[\n"); for (i = 0; i < info_out->numSysVals; i++) { - if (&(info_out->sv[i])) { INFO(" {\"id\":\"%d\", \"sn\":\"%d\", \"si\":\"%d\"}\n", - info_out->sv[i].id, info_out->sv[i].sn, info_out->sv[i].si); - } + info_out->sv[i].id, info_out->sv[i].sn, info_out->sv[i].si); } INFO("\n ],\n"); } if (info_out->numInputs) { INFO(" \"in\":[\n"); for (i = 0; i < info_out->numInputs; i++) { - if (&(info_out->in[i])) { - INFO(" {\"id\":\"%d\",\t\"sn\":\"%d\",\t\"si\":\"%d\"}\n", - info_out->in[i].id, info_out->in[i].sn, info_out->in[i].si); - } + INFO(" {\"id\":\"%d\",\t\"sn\":\"%d\",\t\"si\":\"%d\"}\n", + info_out->in[i].id, info_out->in[i].sn, info_out->in[i].si); } INFO("\n ],\n"); } if (info_out->numOutputs) { INFO(" \"out\":[\n"); for (i = 0; i < info_out->numOutputs; i++) { - if (&(info_out->out[i])) { - INFO(" {\"id\":\"%d\",\t\"sn\":\"%d\",\t\"si\":\"%d\"}\n", - info_out->out[i].id, info_out->out[i].sn, info_out->out[i].si); - } + INFO(" {\"id\":\"%d\",\t\"sn\":\"%d\",\t\"si\":\"%d\"}\n", + info_out->out[i].id, info_out->out[i].sn, info_out->out[i].si); } INFO("\n ],\n"); }