From e34fa1df67fbe0173b4ea9abddcc3ae3d0537037 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 14 Jan 2015 14:55:47 -0800 Subject: Print more info in MarkSweep::VerifyRoot Refactored old root callback to use a new class called RootInfo. RootInfo contains all the relevant info related to the root associated with the callback. The MarkSweep::VerifyRoot function now uses this info to print the StackVisitor's described location if the GC root is of the type kRootJavaFrame. Some other cleanup. Example output: E/art (12167): Tried to mark 0x123 not contained by any spaces E/art (12167): Attempting see if it's a bad root E/art (12167): Found invalid root: 0x123 with type RootJavaFrame E/art (12167): Location=Visiting method 'void java.lang.Runtime.gc()' at dex PC 0xffffffff (native PC 0x0) vreg=0 (cherry picked from commit 12f7423a2bb4bfab76700d84eb6d4338d211983a) Bug: 18588862 Change-Id: Ic5a2781f704e931265ffb3621c2eab4b2e25f60f --- runtime/mirror/array-inl.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'runtime/mirror/array-inl.h') diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h index 4dddd38b80..048d8ba08f 100644 --- a/runtime/mirror/array-inl.h +++ b/runtime/mirror/array-inl.h @@ -200,9 +200,7 @@ inline Array* Array::Alloc(Thread* self, Class* array_class, int32_t component_c template inline void PrimitiveArray::VisitRoots(RootCallback* callback, void* arg) { - if (!array_class_.IsNull()) { - array_class_.VisitRoot(callback, arg, 0, kRootStickyClass); - } + array_class_.VisitRootIfNonNull(callback, arg, RootInfo(kRootStickyClass)); } template -- cgit v1.2.3-59-g8ed1b