From 639211dea818bc0582843285ff69ebe778ef0f8f Mon Sep 17 00:00:00 2001
From: Mel Henning <drawoc@darkrefraction.com>
Date: Mon, 23 Dec 2024 18:42:11 -0500
Subject: [PATCH] compiler/rust/bitset: Fix the bitset iterator

Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32812>
---
 src/compiler/rust/bitset.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compiler/rust/bitset.rs b/src/compiler/rust/bitset.rs
index 31c6958ca30..dd422f9c92d 100644
--- a/src/compiler/rust/bitset.rs
+++ b/src/compiler/rust/bitset.rs
@@ -243,6 +243,7 @@ impl<'a> Iterator for BitSetIter<'a> {
         while self.w < self.set.words.len() {
             let b = (self.set.words[self.w] & self.mask).trailing_zeros();
             if b < 32 {
+                self.mask &= !(1 << b);
                 return Some(self.w * 32 + usize::try_from(b).unwrap());
             }
             self.mask = u32::MAX;