diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-02-19 10:54:44 -0800 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2014-02-21 15:24:04 -0800 |
commit | 4e30541a92381fb280cd0be9a1763b713ee4d64c (patch) | |
tree | 84093651bbf0ad95b66b846c4f4cf4101994037b /runtime/mirror/array.h | |
parent | e266ba9935bd12d685d83f73cd8d759e46c3014d (diff) | |
download | art-4e30541a92381fb280cd0be9a1763b713ee4d64c.tar.gz art-4e30541a92381fb280cd0be9a1763b713ee4d64c.tar.bz2 art-4e30541a92381fb280cd0be9a1763b713ee4d64c.zip |
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
Diffstat (limited to 'runtime/mirror/array.h')
-rw-r--r-- | runtime/mirror/array.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h index 7555975c41..c4f9a755b3 100644 --- a/runtime/mirror/array.h +++ b/runtime/mirror/array.h @@ -53,17 +53,18 @@ class MANAGED Array : public Object { const SirtRef<IntArray>& dimensions) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> size_t SizeOf() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - + template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> int32_t GetLength() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return GetField32(OFFSET_OF_OBJECT_MEMBER(Array, length_), false); + return GetField32<kVerifyFlags>(OFFSET_OF_OBJECT_MEMBER(Array, length_), false); } void SetLength(int32_t length) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { CHECK_GE(length, 0); // We use non transactional version since we can't undo this write. We also disable checking // since it would fail during a transaction. - SetField32<false, false>(OFFSET_OF_OBJECT_MEMBER(Array, length_), length, false, false); + SetField32<false, false, kVerifyNone>(OFFSET_OF_OBJECT_MEMBER(Array, length_), length, false); } static MemberOffset LengthOffset() { @@ -94,8 +95,10 @@ class MANAGED Array : public Object { // Returns true if the index is valid. If not, throws an ArrayIndexOutOfBoundsException and // returns false. + template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> bool CheckIsValidIndex(int32_t index) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - if (UNLIKELY(static_cast<uint32_t>(index) >= static_cast<uint32_t>(GetLength()))) { + if (UNLIKELY(static_cast<uint32_t>(index) >= + static_cast<uint32_t>(GetLength<kVerifyFlags>()))) { ThrowArrayIndexOutOfBoundsException(index); return false; } |