From 2dfa00f6f276c700c479c1e1e3cb927c626cabe2 Mon Sep 17 00:00:00 2001
From: Jim Ingham <jingham@apple.com>
Date: Wed, 18 Jun 2014 23:40:13 +0000
Subject: [PATCH] Actually make a real scoped locker rather than constructing
 one that gets immediately thrown away...

llvm-svn: 211242
---
 lldb/source/Breakpoint/BreakpointSite.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lldb/source/Breakpoint/BreakpointSite.cpp b/lldb/source/Breakpoint/BreakpointSite.cpp
index 8290341..3cf6d37 100644
--- a/lldb/source/Breakpoint/BreakpointSite.cpp
+++ b/lldb/source/Breakpoint/BreakpointSite.cpp
@@ -61,7 +61,7 @@ BreakpointSite::GetNextID()
 bool
 BreakpointSite::ShouldStop (StoppointCallbackContext *context)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     IncrementHitCount();
     return m_owners.ShouldStop (context);
 }
@@ -69,7 +69,7 @@ BreakpointSite::ShouldStop (StoppointCallbackContext *context)
 bool
 BreakpointSite::IsBreakpointAtThisSite (lldb::break_id_t bp_id)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     const size_t owner_count = m_owners.GetSize();
     for (size_t i = 0; i < owner_count; i++)
     {
@@ -96,7 +96,7 @@ BreakpointSite::Dump(Stream *s) const
 void
 BreakpointSite::GetDescription (Stream *s, lldb::DescriptionLevel level)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     if (level != lldb::eDescriptionLevelBrief)
         s->Printf ("breakpoint site: %d at 0x%8.8" PRIx64, GetID(), GetLoadAddress());
     m_owners.GetDescription (s, level);
@@ -105,7 +105,6 @@ BreakpointSite::GetDescription (Stream *s, lldb::DescriptionLevel level)
 bool
 BreakpointSite::IsInternal() const
 {
-    Mutex::Locker(m_owners_mutex);
     return m_owners.IsInternal();
 }
 
@@ -167,14 +166,14 @@ BreakpointSite::SetEnabled (bool enabled)
 void
 BreakpointSite::AddOwner (const BreakpointLocationSP &owner)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     m_owners.Add(owner);
 }
 
 size_t
 BreakpointSite::RemoveOwner (lldb::break_id_t break_id, lldb::break_id_t break_loc_id)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     m_owners.Remove(break_id, break_loc_id);
     return m_owners.GetSize();
 }
@@ -182,21 +181,21 @@ BreakpointSite::RemoveOwner (lldb::break_id_t break_id, lldb::break_id_t break_l
 size_t
 BreakpointSite::GetNumberOfOwners ()
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     return m_owners.GetSize();
 }
 
 BreakpointLocationSP
 BreakpointSite::GetOwnerAtIndex (size_t index)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     return m_owners.GetByIndex (index);
 }
 
 bool
 BreakpointSite::ValidForThisThread (Thread *thread)
 {
-    Mutex::Locker(m_owners_mutex);
+    Mutex::Locker locker(m_owners_mutex);
     return m_owners.ValidForThisThread(thread);
 }
 
-- 
2.7.4