Copy ExpandInlineAsm to TargetLowering from TargetAsmInfo.

[oota-llvm.git] / include / llvm / System / Mutex.h

diff --git a/include/llvm/System/Mutex.h b/include/llvm/System/Mutex.h
index 2a70ba013a0033dcbd96d8f82608912d42d261f1..9ef5942a702b6ebc0f130859add406e39f282e2a 100644 (file)
--- a/include/llvm/System/Mutex.h
+++ b/include/llvm/System/Mutex.h
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_MUTEX_H
 
 #include "llvm/System/Threading.h"
+#include <cassert>
 
 namespace llvm
 {
@@ -85,18 +86,32 @@ namespace llvm
     /// running in multithreaded mode.
     template<bool mt_only>
     class SmartMutex : public MutexImpl {
+      unsigned acquired;
+      bool recursive;
     public:
-      explicit SmartMutex(bool recursive = true) : MutexImpl(recursive) { }
+      explicit SmartMutex(bool rec = true) :
+        MutexImpl(rec), acquired(0), recursive(rec) { }
       
       bool acquire() {
-        if (!mt_only && llvm_is_multithreaded())
+        if (!mt_only || llvm_is_multithreaded())
           return MutexImpl::acquire();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert((recursive || acquired == 0) && "Lock already acquired!!");
+        ++acquired;
         return true;
       }
 
       bool release() {
         if (!mt_only || llvm_is_multithreaded())
           return MutexImpl::release();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert(((recursive && acquired) || (acquired == 1)) &&
+               "Lock not acquired before release!");
+        --acquired;
         return true;
       }
 
@@ -116,15 +131,15 @@ namespace llvm
     
     template<bool mt_only>
     class SmartScopedLock  {
-      SmartMutex<mt_only>* mtx;
+      SmartMutex<mt_only>& mtx;
       
     public:
-      SmartScopedLock(SmartMutex<mt_only>* m) : mtx(m) {
-        mtx->acquire();
+      SmartScopedLock(SmartMutex<mt_only>& m) : mtx(m) {
+        mtx.acquire();
       }
       
       ~SmartScopedLock() {
-        mtx->release();
+        mtx.release();
       }
     };