From f5dec38bf83be1995bae7d88b24da717207141ed Mon Sep 17 00:00:00 2001
From: Gerald Squelart <gsquelart@mozilla.com>
Date: Sun, 27 Feb 2022 23:32:56 +0000
Subject: [PATCH] Bug 1757100 - Sprinkle [[nodiscard]] and =delete in RWLock.h
 - r=glandium,xpcom-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D139680
---
 xpcom/threads/RWLock.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/xpcom/threads/RWLock.h b/xpcom/threads/RWLock.h
index ba68a66650dc..9c47029d7a0c 100644
--- a/xpcom/threads/RWLock.h
+++ b/xpcom/threads/RWLock.h
@@ -44,17 +44,19 @@ class RWLock : public detail::RWLockImpl, public BlockingResourceBase {
 
 #ifdef DEBUG
   bool LockedForWritingByCurrentThread();
-  bool TryReadLock();
+  [[nodiscard]] bool TryReadLock();
   void ReadLock();
   void ReadUnlock();
-  bool TryWriteLock();
+  [[nodiscard]] bool TryWriteLock();
   void WriteLock();
   void WriteUnlock();
 #else
-  bool TryReadLock() { return detail::RWLockImpl::tryReadLock(); }
+  [[nodiscard]] bool TryReadLock() { return detail::RWLockImpl::tryReadLock(); }
   void ReadLock() { detail::RWLockImpl::readLock(); }
   void ReadUnlock() { detail::RWLockImpl::readUnlock(); }
-  bool TryWriteLock() { return detail::RWLockImpl::tryWriteLock(); }
+  [[nodiscard]] bool TryWriteLock() {
+    return detail::RWLockImpl::tryWriteLock();
+  }
   void WriteLock() { detail::RWLockImpl::writeLock(); }
   void WriteUnlock() { detail::RWLockImpl::writeUnlock(); }
 #endif
@@ -184,15 +186,15 @@ class StaticRWLock {
   StaticRWLock() { MOZ_ASSERT(!mLock); }
 #endif
 
-  bool TryReadLock() { return Lock()->TryReadLock(); }
+  [[nodiscard]] bool TryReadLock() { return Lock()->TryReadLock(); }
   void ReadLock() { Lock()->ReadLock(); }
   void ReadUnlock() { Lock()->ReadUnlock(); }
-  bool TryWriteLock() { return Lock()->TryWriteLock(); }
+  [[nodiscard]] bool TryWriteLock() { return Lock()->TryWriteLock(); }
   void WriteLock() { Lock()->WriteLock(); }
   void WriteUnlock() { Lock()->WriteUnlock(); }
 
  private:
-  RWLock* Lock() {
+  [[nodiscard]] RWLock* Lock() {
     if (mLock) {
       return mLock;
     }
@@ -216,9 +218,9 @@ class StaticRWLock {
 #endif
 
   // Disallow these operators.
-  StaticRWLock& operator=(StaticRWLock* aRhs);
-  static void* operator new(size_t) noexcept(true);
-  static void operator delete(void*);
+  StaticRWLock& operator=(StaticRWLock* aRhs) = delete;
+  static void* operator new(size_t) noexcept(true) = delete;
+  static void operator delete(void*) = delete;
 };
 
 typedef BaseAutoTryReadLock<StaticRWLock> StaticAutoTryReadLock;