commit 423d2a3dcbb260b020efb5da59f784c9f02accbf
author Mathieu Chartier <mathieuc@google.com> Thu Sep 12 17:33:56 2013 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Sep 13 10:30:24 2013 -0700
tree 79ed739e6072f8308c1cd880f9420a1c63539c95
parent b048dd2b662c19644361f4396a1e8d6213445ee8

Add support for changing roots through the root visitor callback.

Needed for copying collectors.

Change-Id: Icc4a342a57e0cfb79587edb02ef8c85e08808877

runtime/throw_location.cc

diff --git a/runtime/throw_location.cc b/runtime/throw_location.cc
index e428511..01497ef 100644
--- a/runtime/throw_location.cc
+++ b/runtime/throw_location.cc
@@ -34,11 +34,14 @@
 }
 
 void ThrowLocation::VisitRoots(RootVisitor* visitor, void* arg) {
-  if (this_object_ != NULL) {
-    visitor(this_object_, arg);
+  if (this_object_ != nullptr) {
+    this_object_ = const_cast<mirror::Object*>(visitor(this_object_, arg));
+    DCHECK(this_object_ != nullptr);
   }
-  if (method_ != NULL) {
-    visitor(method_, arg);
+  if (method_ != nullptr) {
+    method_ = const_cast<mirror::ArtMethod*>(
+        reinterpret_cast<const mirror::ArtMethod*>(visitor(method_, arg)));
+    DCHECK(method_ != nullptr);
   }
 }