[libc-commits] [libc] [libc] Fix -Wshadow warning in raw_rwlock.h (PR #196852)

Nico Weber via libc-commits libc-commits at lists.llvm.org
Sun May 10 17:38:04 PDT 2026


https://github.com/nico created https://github.com/llvm/llvm-project/pull/196852

None

>From fab4d340e937eb09d61ea5d0ad0694fdc1b04251 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis at chromium.org>
Date: Sun, 10 May 2026 19:18:33 -0400
Subject: [PATCH] [libc] Fix -Wshadow warning in raw_rwlock.h

---
 libc/src/__support/threads/raw_rwlock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/src/__support/threads/raw_rwlock.h b/libc/src/__support/threads/raw_rwlock.h
index 2c14645a2e5ce..9bc1b88cabd69 100644
--- a/libc/src/__support/threads/raw_rwlock.h
+++ b/libc/src/__support/threads/raw_rwlock.h
@@ -399,8 +399,8 @@ class RawRwLock {
       // reached.
       bool timeout_flag = false;
       if (!old.can_acquire<role>(get_preference())) {
-        auto result = queue.wait<role>(serial_number, timeout, is_pshared);
-        timeout_flag = (!result.has_value() && timeout.has_value());
+        auto wait_result = queue.wait<role>(serial_number, timeout, is_pshared);
+        timeout_flag = (!wait_result.has_value() && timeout.has_value());
       }
 
       // Phase 7: unregister ourselves as a pending reader/writer.



More information about the libc-commits mailing list