From 4efaa8013986997ac79ee4fd47283ee92da04f71 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 24 May 2019 23:29:15 -0500 Subject: [PATCH] nir/opt_deref: Report progress if we remove a deref Fixes: a1c688517de "nir/opt_deref: Properly optimize ptr_as_array..." Reviewed-by: Dave Airlie Part-of: (cherry picked from commit db6d9cdf0661fbe25b1bc767920a5f6a0944935b) --- .pick_status.json | 2 +- src/compiler/nir/nir_deref.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c6a2f25e4eb..2383c20c66f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1696,7 +1696,7 @@ "description": "nir/opt_deref: Report progress if we remove a deref", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "a1c688517dee32c57af17d8e11029eb7470f52d4" }, diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c index e06fd07aeb2..65757fce16f 100644 --- a/src/compiler/nir/nir_deref.c +++ b/src/compiler/nir/nir_deref.c @@ -940,7 +940,9 @@ opt_deref_cast(nir_builder *b, nir_deref_instr *cast) /* If uses would be a bit crazy */ assert(list_is_empty(&cast->dest.ssa.if_uses)); - nir_deref_instr_remove_if_unused(cast); + if (nir_deref_instr_remove_if_unused(cast)) + progress = true; + return progress; }