diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-01 01:15:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-01 01:15:09 +0000 |
| commit | 8fcda9b52019128cec2d35f010c3fb7aac89cf79 (patch) | |
| tree | 7ad0fd61116de65f91658817f4e8a93e204baf59 /runtime | |
| parent | 5a40712f67341a8b919afbe6a6d462e8f9044767 (diff) | |
| parent | 9e8b367100da968e0a2fd5e0db6330d108421203 (diff) | |
| download | art-8fcda9b52019128cec2d35f010c3fb7aac89cf79.zip art-8fcda9b52019128cec2d35f010c3fb7aac89cf79.tar.gz art-8fcda9b52019128cec2d35f010c3fb7aac89cf79.tar.bz2 | |
Merge "Add VerifyObject calls to JniMethodEndWithReference."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/entrypoints/quick/quick_jni_entrypoints.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc index 59da7a0..737fa3e 100644 --- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc @@ -92,6 +92,7 @@ extern mirror::Object* JniMethodEndWithReference(jobject result, uint32_t saved_ } CheckReferenceResult(o, self); } + VerifyObject(o); return o; } @@ -109,6 +110,7 @@ extern mirror::Object* JniMethodEndWithReferenceSynchronized(jobject result, } CheckReferenceResult(o, self); } + VerifyObject(o); return o; } |