commit 3b05e9ba874449dbff65b01b8781001f7d93eea6
author Mathieu Chartier <mathieuc@google.com> Tue Mar 25 09:29:43 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Mar 25 13:56:58 2014 -0700
tree f341766bff83ebea510344c4857af493725d3f58
parent 027f7fa539514d2a50b448de1de39ac307087483

Add missing debugger root visiting.

Bug: 13634574
Change-Id: I2a76f6c43f1d0ad1922f06deb40a71ff651129fd

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 8e14924..38e4204 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -2025,6 +2025,12 @@
   jni_env_->locals.VisitRoots(visitor, arg, thread_id, kRootJNILocal);
   jni_env_->monitors.VisitRoots(visitor, arg, thread_id, kRootJNIMonitor);
   SirtVisitRoots(visitor, arg, thread_id);
+  if (debug_invoke_req_ != nullptr) {
+    debug_invoke_req_->VisitRoots(visitor, arg, thread_id, kRootDebugger);
+  }
+  if (single_step_control_ != nullptr) {
+    single_step_control_->VisitRoots(visitor, arg, thread_id, kRootDebugger);
+  }
   // Visit roots on this thread's stack
   Context* context = GetLongJumpContext();
   RootCallbackVisitor visitorToCallback(visitor, arg, thread_id);