From 423d2a3dcbb260b020efb5da59f784c9f02accbf Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 12 Sep 2013 17:33:56 -0700 Subject: Add support for changing roots through the root visitor callback. Needed for copying collectors. Change-Id: Icc4a342a57e0cfb79587edb02ef8c85e08808877 --- runtime/intern_table.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/intern_table.cc') diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc index e3a75cf..6b0a51b 100644 --- a/runtime/intern_table.cc +++ b/runtime/intern_table.cc @@ -44,14 +44,14 @@ void InternTable::DumpForSigQuit(std::ostream& os) const { void InternTable::VisitRoots(RootVisitor* visitor, void* arg, bool clean_dirty) { MutexLock mu(Thread::Current(), intern_table_lock_); - for (const auto& strong_intern : strong_interns_) { - visitor(strong_intern.second, arg); + for (auto& strong_intern : strong_interns_) { + strong_intern.second = reinterpret_cast(visitor(strong_intern.second, arg)); + DCHECK(strong_intern.second != nullptr); } if (clean_dirty) { is_dirty_ = false; } - // Note: we deliberately don't visit the weak_interns_ table and the immutable - // image roots. + // Note: we deliberately don't visit the weak_interns_ table and the immutable image roots. } mirror::String* InternTable::Lookup(Table& table, mirror::String* s, -- cgit v1.1