From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Thu, 15 Aug 2019 22:24:21 +0000 (+0000)
Subject: Revert "[Support] Re-introduce the RWMutexImpl for macOS < 10.12"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cac28c1ba659903d896297f5a122d294e85768f3;p=llvm

Revert "[Support] Re-introduce the RWMutexImpl for macOS < 10.12"

This doesn't work (yet).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@369059 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/RWMutex.h b/include/llvm/Support/RWMutex.h
index 8407898b73e..d4587772ac6 100644
--- a/include/llvm/Support/RWMutex.h
+++ b/include/llvm/Support/RWMutex.h
@@ -31,71 +31,8 @@ namespace sys {
       // on Windows and always available on MSVC.
 #if defined(_MSC_VER) || __cplusplus > 201402L
       std::shared_mutex impl;
-#else
-      // std::shared_timed_mutex is only availble on macOS 10.12 and later.
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&                  \
-    defined(__MAC_10_12) &&                                                    \
-    __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < __MAC_10_12
-      /// Platform agnostic RWMutex class.
-      /// Platform agnostic RWMutex class.
-      class RWMutexImpl {
-        /// @name Constructors
-        /// @{
-      public:
-        /// Initializes the lock but doesn't acquire it.
-        /// Default Constructor.
-        explicit RWMutexImpl();
-
-        /// @}
-        /// @name Do Not Implement
-        /// @{
-        RWMutexImpl(const RWMutexImpl &original) = delete;
-        RWMutexImpl &operator=(const RWMutexImpl &) = delete;
-        /// @}
-
-        /// Releases and removes the lock
-        /// Destructor
-        ~RWMutexImpl();
-
-        /// @}
-        /// @name Methods
-        /// @{
-      public:
-        /// Attempts to unconditionally acquire the lock in reader mode. If the
-        /// lock is held by a writer, this method will wait until it can acquire
-        /// the lock.
-        /// @returns false if any kind of error occurs, true otherwise.
-        /// Unconditionally acquire the lock in reader mode.
-        bool reader_acquire();
-
-        /// Attempts to release the lock in reader mode.
-        /// @returns false if any kind of error occurs, true otherwise.
-        /// Unconditionally release the lock in reader mode.
-        bool reader_release();
-
-        /// Attempts to unconditionally acquire the lock in reader mode. If the
-        /// lock is held by any readers, this method will wait until it can
-        /// acquire the lock.
-        /// @returns false if any kind of error occurs, true otherwise.
-        /// Unconditionally acquire the lock in writer mode.
-        bool writer_acquire();
-
-        /// Attempts to release the lock in writer mode.
-        /// @returns false if any kind of error occurs, true otherwise.
-        /// Unconditionally release the lock in write mode.
-        bool writer_release();
-
-        //@}
-        /// @name Platform Dependent Data
-        /// @{
-      private:
-#if defined(LLVM_ENABLE_THREADS) && LLVM_ENABLE_THREADS != 0
-        void *data_ = nullptr; ///< We don't know what the data will be
-#endif
-      } impl;
 #else
       std::shared_timed_mutex impl;
-#endif
 #endif
       unsigned readers = 0;
       unsigned writers = 0;