Make stack visitor location for bad roots more verbose.
Change-Id: Ib2f3f48ccf1f5b2f3a4d1a61df553ad1a5c29d38
diff --git a/src/gc/mark_sweep.cc b/src/gc/mark_sweep.cc
index 1ccceaa..e0ecc99 100644
--- a/src/gc/mark_sweep.cc
+++ b/src/gc/mark_sweep.cc
@@ -260,19 +260,18 @@
}
void MarkSweep::VerifyRootCallback(const Object* root, void* arg, size_t vreg,
- const AbstractMethod* method) {
- reinterpret_cast<MarkSweep*>(arg)->VerifyRoot(root, vreg, method);
+ const StackVisitor* visitor) {
+ reinterpret_cast<MarkSweep*>(arg)->VerifyRoot(root, vreg, visitor);
}
-void MarkSweep::VerifyRoot(const Object* root, size_t vreg, const AbstractMethod* method) {
+void MarkSweep::VerifyRoot(const Object* root, size_t vreg, const StackVisitor* visitor) {
// See if the root is on any space bitmap.
if (GetHeap()->GetLiveBitmap()->GetSpaceBitmap(root) == NULL) {
LargeObjectSpace* large_object_space = GetHeap()->GetLargeObjectsSpace();
if (!large_object_space->Contains(root)) {
LOG(ERROR) << "Found invalid root: " << root;
- LOG(ERROR) << "VReg: " << vreg;
- if (method != NULL) {
- LOG(ERROR) << "In method " << PrettyMethod(method, true);
+ if (visitor != NULL) {
+ LOG(ERROR) << visitor->DescribeLocation() << " in VReg: " << vreg;
}
}
}