commit e8a3c576301fd531d5f73a65fc8b84a63619d580
author Mathieu Chartier <mathieuc@google.com> Tue Oct 11 16:52:17 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Oct 12 13:30:54 2016 -0700
tree a00e488f153505ee890c28873308d373e6ab231b
parent e8317d90c61dde07c12e404a2bc1fabf584905c1

Replace StackHandleScopeCollection with VariableSizedHandleScope

VariableSizedHandleScope's internal handle scopes are not pushed
directly on the thread. This means that it is safe to intermix with
other types of handle scopes.

Added test.

Test: clean-oat-host && test-art-host

Change-Id: Id2fd1155788428f394d49615d337d9134824c8f0

runtime/native/dalvik_system_VMDebug.cc

diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc
index 31ce4c1..1852956 100644
--- a/runtime/native/dalvik_system_VMDebug.cc
+++ b/runtime/native/dalvik_system_VMDebug.cc
@@ -265,7 +265,7 @@
   if (c == nullptr) {
     return 0;
   }
-  StackHandleScopeCollection hs(soa.Self());
+  VariableSizedHandleScope hs(soa.Self());
   std::vector<Handle<mirror::Class>> classes {hs.NewHandle(c)};
   uint64_t count = 0;
   heap->CountInstances(classes, countAssignable, &count);
@@ -284,7 +284,7 @@
   if (decoded_classes == nullptr) {
     return nullptr;
   }
-  StackHandleScopeCollection hs(soa.Self());
+  VariableSizedHandleScope hs(soa.Self());
   std::vector<Handle<mirror::Class>> classes;
   for (size_t i = 0, count = decoded_classes->GetLength(); i < count; ++i) {
     classes.push_back(hs.NewHandle(decoded_classes->Get(i)));