Add a SmartScopedLock, and use it to simplify code.

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

2 files changed, 20 insertions, 5 deletions

diff --git a/include/llvm/System/Mutex.h b/include/llvm/System/Mutex.h
index d8a18865f6..6f5614f701 100644
--- a/include/llvm/System/Mutex.h
+++ b/include/llvm/System/Mutex.h
@@ -115,6 +115,22 @@ namespace llvm
     
     /// Mutex - A standard, always enforced mutex.
     typedef SmartMutex<false> Mutex;
+    
+    template<bool mt_only>
+    class SmartScopedLock  {
+      SmartMutex<mt_only>* mtx;
+      
+    public:
+      SmartScopedLock(SmartMutex<mt_only>* m) : mtx(m) {
+        mtx->acquire();
+      }
+      
+      ~SmartScopedLock() {
+        mtx->release();
+      }
+    };
+    
+    typedef SmartScopedLock<false> ScopedLock;
   }
 }
 
diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index e0ff1845f1..86cf10e673 100644
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -358,7 +358,7 @@ namespace {
 /// -time-passes is enabled on the command line.
 ///
 
-static ManagedStatic<sys::Mutex> TimingInfoMutex;
+static ManagedStatic<sys::SmartMutex<true> > TimingInfoMutex;
 
 class VISIBILITY_HIDDEN TimingInfo {
   std::map<Pass*, Timer> TimingData;
@@ -384,22 +384,21 @@ public:
     if (dynamic_cast<PMDataManager *>(P)) 
       return;
 
-    if (llvm_is_multithreaded()) TimingInfoMutex->acquire();
+    sys::SmartScopedLock<true> Lock(&*TimingInfoMutex);
     std::map<Pass*, Timer>::iterator I = TimingData.find(P);
     if (I == TimingData.end())
       I=TimingData.insert(std::make_pair(P, Timer(P->getPassName(), TG))).first;
     I->second.startTimer();
-    if (llvm_is_multithreaded()) TimingInfoMutex->release();
   }
+  
   void passEnded(Pass *P) {
     if (dynamic_cast<PMDataManager *>(P)) 
       return;
 
-    if (llvm_is_multithreaded()) TimingInfoMutex->acquire();
+    sys::SmartScopedLock<true> Lock(&*TimingInfoMutex);
     std::map<Pass*, Timer>::iterator I = TimingData.find(P);
     assert(I != TimingData.end() && "passStarted/passEnded not nested right!");
     I->second.stopTimer();
-    if (llvm_is_multithreaded()) TimingInfoMutex->release();
   }
 };