commit bfb711b20990b2aae2006f6f8857bfdf566761f4
author Rhys Perry <pendingchaos02@gmail.com> Tue Nov 24 10:52:56 2020 +0000
committer Dylan Baker <dylan.c.baker@intel.com> Tue Dec 01 09:12:32 2020 -0800
tree 1b0af7d605f658d5a491ef79d921e694ced49f58
parent 9c6e0fb47615d380f3d1202a6718d2781af79197

nir/unsigned_upper_bound: fix buffer overflow in search_phi_bcsel

It should only recurse if there's enough space to add the phi sources.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Fixes: 72ac3f60261 ("nir: add nir_unsigned_upper_bound and nir_addition_might_overflow")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7748>
(cherry picked from commit 65fbae16e37b5f349a0d0feb8d54ba132a1f02f4)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 28d6e2c..304b385 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2416,7 +2416,7 @@
         "description": "nir/unsigned_upper_bound: fix buffer overflow in search_phi_bcsel",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "72ac3f60261a8510512861b93e843e695331e2ab"
     },