diff options
| author | 2014-02-21 08:29:13 +0000 | |
|---|---|---|
| committer | 2014-02-21 08:29:14 +0000 | |
| commit | 58dabb5456eb4550fbd82012d9bc551920f1313c (patch) | |
| tree | 3eab762bf578c3ba9adcb76f074723db356006b1 /runtime/debugger.cc | |
| parent | 553e30c53423459bef6840a3e358199b1ae2db58 (diff) | |
| parent | 11d40c250ec86c784cf76b8c31e1cf9285d555dc (diff) | |
Merge "Fix deoptimization deadlock"
Diffstat (limited to 'runtime/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 3c238d6505..89f841eb3d 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -594,12 +594,12 @@ void Dbg::Disconnected() { MutexLock mu(Thread::Current(), *Locks::deoptimization_lock_); gDeoptimizationRequests.clear(); } - runtime->GetInstrumentation()->DisableDeoptimization(); runtime->GetInstrumentation()->RemoveListener(&gDebugInstrumentationListener, instrumentation::Instrumentation::kMethodEntered | instrumentation::Instrumentation::kMethodExited | instrumentation::Instrumentation::kDexPcMoved | instrumentation::Instrumentation::kExceptionCaught); + runtime->GetInstrumentation()->DisableDeoptimization(); gDebuggerActive = false; gRegistry->Clear(); gDebuggerConnected = false; |