summaryrefslogtreecommitdiff
path: root/runtime/class_linker_test.cc
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2019-06-27 15:50:11 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> 2019-06-28 14:58:17 +0000
commit79d6c800cd8aa1da335ea0523c391852780ac02a (patch)
treea77faf41d7b658709113c72d7eaaaa1ce2ded6b5 /runtime/class_linker_test.cc
parent01fbfbebceb00b94cc54738ebf425b6c4a79211a (diff)
Revert^2 "Support using opaque JNI ids"
We weren't handing the fact that encoding jmethodIDs could cause OOM exceptions in some places in reflection.cc. This could lead to attempting to use a null jmethodID as if it were a real id. This issue is fixed by the parent CL. This reverts commit b476a29a2c. This reverts commit 3b2905366c. This Unreverts commit d5d645ffec. This Unreverts commit 21d5994583. Reason for revert: Fixed issue causing 004 debuggable flakes Test: ./test.py --host --jit --debuggable Bug: 134162467 Change-Id: Iece08ab299cd8a20f8382be7be6c3796858e70eb
Diffstat (limited to 'runtime/class_linker_test.cc')
-rw-r--r--runtime/class_linker_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 2a7cbaa991..0ffbc4a56d 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -610,6 +610,8 @@ struct ClassOffsets : public CheckOffsets<mirror::Class> {
struct ClassExtOffsets : public CheckOffsets<mirror::ClassExt> {
ClassExtOffsets() : CheckOffsets<mirror::ClassExt>(false, "Ldalvik/system/ClassExt;") {
+ addOffset(OFFSETOF_MEMBER(mirror::ClassExt, instance_jfield_ids_), "instanceJfieldIDs");
+ addOffset(OFFSETOF_MEMBER(mirror::ClassExt, jmethod_ids_), "jmethodIDs");
addOffset(OFFSETOF_MEMBER(mirror::ClassExt, obsolete_dex_caches_), "obsoleteDexCaches");
addOffset(OFFSETOF_MEMBER(mirror::ClassExt, obsolete_methods_), "obsoleteMethods");
addOffset(OFFSETOF_MEMBER(mirror::ClassExt, original_dex_file_), "originalDexFile");
@@ -617,6 +619,7 @@ struct ClassExtOffsets : public CheckOffsets<mirror::ClassExt> {
"preRedefineClassDefIndex");
addOffset(OFFSETOF_MEMBER(mirror::ClassExt, pre_redefine_dex_file_ptr_),
"preRedefineDexFilePtr");
+ addOffset(OFFSETOF_MEMBER(mirror::ClassExt, static_jfield_ids_), "staticJfieldIDs");
addOffset(OFFSETOF_MEMBER(mirror::ClassExt, verify_error_), "verifyError");
}
};