summaryrefslogtreecommitdiff
path: root/compiler/image_writer.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2016-10-11 16:52:17 -0700
committer Mathieu Chartier <mathieuc@google.com> 2016-10-12 13:30:54 -0700
commite8a3c576301fd531d5f73a65fc8b84a63619d580 (patch)
treea00e488f153505ee890c28873308d373e6ab231b /compiler/image_writer.cc
parente8317d90c61dde07c12e404a2bc1fabf584905c1 (diff)
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
Diffstat (limited to 'compiler/image_writer.cc')
-rw-r--r--compiler/image_writer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index 8ae04a1e49..13c73dcf42 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -1389,7 +1389,7 @@ void ImageWriter::ProcessWorkStack(WorkStack* work_stack) {
void ImageWriter::CalculateNewObjectOffsets() {
Thread* const self = Thread::Current();
- StackHandleScopeCollection handles(self);
+ VariableSizedHandleScope handles(self);
std::vector<Handle<ObjectArray<Object>>> image_roots;
for (size_t i = 0, size = oat_filenames_.size(); i != size; ++i) {
image_roots.push_back(handles.NewHandle(CreateImageRoots(i)));