| commit | c645f1ddb7c40bea6a38eda4b3f83f6b6dec405b | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Mar 06 18:11:53 2014 -0800 |
| committer | Mathieu Chartier <mathieuc@google.com> | Fri Mar 07 12:09:04 2014 -0800 |
| tree | de6141864c1c011216c19dd99a2c1e2bc442dd6d | |
| parent | a9d7be62735e3356cef7e8ed797c519134a17061 [diff] |
Add more VerifyObject calls. Added verify object calls to SirtRef, IndirectReferenceTable, ReferenceTable. Removed un-needed verify object in ScopedObjectAccess / DecodeJObject since object sources are handled. Bug: 12934910 Change-Id: I55a46a8ea61fed2a77526eda27fd2cce97a9b125
diff --git a/runtime/native/java_lang_Runtime.cc b/runtime/native/java_lang_Runtime.cc index 0629f4d..f6149ff 100644 --- a/runtime/native/java_lang_Runtime.cc +++ b/runtime/native/java_lang_Runtime.cc
@@ -24,6 +24,7 @@ #include "runtime.h" #include "scoped_thread_state_change.h" #include "ScopedUtfChars.h" +#include "sirt_ref-inl.h" namespace art {
diff --git a/runtime/native/scoped_fast_native_object_access.h b/runtime/native/scoped_fast_native_object_access.h index b5ee748..645d78c 100644 --- a/runtime/native/scoped_fast_native_object_access.h +++ b/runtime/native/scoped_fast_native_object_access.h
@@ -80,8 +80,6 @@ return NULL; } - VerifyObject(obj); - DCHECK_NE((reinterpret_cast<uintptr_t>(obj) & 0xffff0000), 0xebad0000); IndirectReferenceTable& locals = Env()->locals;