summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2012-04-13 23:29:44 +0000
committerJim Ingham <jingham@apple.com>2012-04-13 23:29:44 +0000
commitd846f1f2b14dd8330d85217f6aa5f132b9bf773a (patch)
tree13065ebaf8f2dfbf8e260c6986d0dcbeab54eb96
parent99ff2c42f663fd77919689e7eef3df3872474073 (diff)
downloadbcm5719-llvm-d846f1f2b14dd8330d85217f6aa5f132b9bf773a.tar.gz
bcm5719-llvm-d846f1f2b14dd8330d85217f6aa5f132b9bf773a.zip
The API lock was getting dropped too soon in GetVariables. GetValueObjectForFrameVariable could run the target (to get dynamic values) and that requires the target lock.
llvm-svn: 154711
-rw-r--r--lldb/source/API/SBFrame.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index 42c522dfe5a..b69441815d7 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -883,11 +883,8 @@ SBFrame::GetVariables (bool arguments,
size_t i;
VariableList *variable_list = NULL;
- // Scope for locker
- {
- Mutex::Locker api_locker (target->GetAPIMutex());
- variable_list = frame->GetVariableList(true);
- }
+ Mutex::Locker api_locker (target->GetAPIMutex());
+ variable_list = frame->GetVariableList(true);
if (variable_list)
{
const size_t num_variables = variable_list->GetSize();
OpenPOWER on IntegriCloud