Remove unnecessary condition in Barrier::wait()

twetzel59 · twetzel59 · commit d65ab29e2e67 · 2021-07-24T15:54:58.000-04:00
diff --git a/library/std/src/sync/barrier.rs b/library/std/src/sync/barrier.rs
@@ -129,7 +129,7 @@ impl Barrier {
         if lock.count < self.num_threads {
             // We need a while loop to guard against spurious wakeups.
             // https://en.wikipedia.org/wiki/Spurious_wakeup
-            while local_gen == lock.generation_id && lock.count < self.num_threads {
+            while local_gen == lock.generation_id {
                 lock = self.cvar.wait(lock).unwrap();
             }
             BarrierWaitResult(false)

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ impl Barrier {`
`129`	`129`	`if lock.count < self.num_threads {`
`130`	`130`	`// We need a while loop to guard against spurious wakeups.`
`131`	`131`	`// https://en.wikipedia.org/wiki/Spurious_wakeup`
`132`		`- while local_gen == lock.generation_id && lock.count < self.num_threads {`
	`132`	`+ while local_gen == lock.generation_id {`
`133`	`133`	`lock = self.cvar.wait(lock).unwrap();`
`134`	`134`	`}`
`135`	`135`	`BarrierWaitResult(false)`