From 4e30541a92381fb280cd0be9a1763b713ee4d64c Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 19 Feb 2014 10:54:44 -0800 Subject: Fix and optimize verify object. VerifyObject no longer resides in heap. You can now enable VerifyObject for non-debug builds. VerifyStack is still slow, so it is now guarded by its own flag. Fixed the image writer to not use verification at places where verification fails due to invalid reads. Fixed RosAlloc to use SizeOf which doesn't call verify object. Added a flag paremeter to some of the mirror getters / setters to be able to selectively disable VerifyObject on certain calls. Optimized the GC to not verify each object multiple times during object scanning if verify object is enabled. Added 3 verification options: verify reads, verify this, and verify writes so that you can select how much verification you want for mirror getters and setters. Removed some useless DCHECKs which would slow debug builds without providing any benefits. TODO: RosAlloc verification doesn't currently work with verify objects. Bug: 12934910 Bug: 12879358 Change-Id: Ic61033104dfc334543f89b0fc0ad8cd4f4015d69 --- runtime/stack.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'runtime/stack.cc') diff --git a/runtime/stack.cc b/runtime/stack.cc index 864b86a..a6a0b29 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -25,14 +25,11 @@ #include "runtime.h" #include "thread_list.h" #include "throw_location.h" +#include "verify_object-inl.h" #include "vmap_table.h" namespace art { -bool ShadowFrame::VerifyReference(const mirror::Object* val) const { - return !Runtime::Current()->GetHeap()->IsInTempSpace(val); -} - mirror::Object* ShadowFrame::GetThisObject() const { mirror::ArtMethod* m = GetMethod(); if (m->IsStatic()) { -- cgit v1.1