diff options
Diffstat (limited to 'runtime/mirror/class.cc')
| -rw-r--r-- | runtime/mirror/class.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc index 846517b524..a299f34ada 100644 --- a/runtime/mirror/class.cc +++ b/runtime/mirror/class.cc @@ -39,6 +39,7 @@ #include "gc/heap-inl.h" #include "handle_scope-inl.h" #include "hidden_api.h" +#include "jni_id_type.h" #include "subtype_check.h" #include "method.h" #include "object-inl.h" @@ -1595,7 +1596,7 @@ ObjPtr<PointerArray> Class::GetMethodIds() { } } ObjPtr<PointerArray> Class::GetOrCreateMethodIds(Handle<Class> h_this) { - DCHECK(Runtime::Current()->JniIdsAreIndices()) << "JNI Ids are pointers!"; + DCHECK_NE(Runtime::Current()->GetJniIdType(), JniIdType::kPointer) << "JNI Ids are pointers!"; Thread* self = Thread::Current(); ObjPtr<ClassExt> ext(EnsureExtDataPresent(h_this, self)); if (ext.IsNull()) { @@ -1614,7 +1615,7 @@ ObjPtr<PointerArray> Class::GetStaticFieldIds() { } } ObjPtr<PointerArray> Class::GetOrCreateStaticFieldIds(Handle<Class> h_this) { - DCHECK(Runtime::Current()->JniIdsAreIndices()) << "JNI Ids are pointers!"; + DCHECK_NE(Runtime::Current()->GetJniIdType(), JniIdType::kPointer) << "JNI Ids are pointers!"; Thread* self = Thread::Current(); ObjPtr<ClassExt> ext(EnsureExtDataPresent(h_this, self)); if (ext.IsNull()) { @@ -1632,7 +1633,7 @@ ObjPtr<PointerArray> Class::GetInstanceFieldIds() { } } ObjPtr<PointerArray> Class::GetOrCreateInstanceFieldIds(Handle<Class> h_this) { - DCHECK(Runtime::Current()->JniIdsAreIndices()) << "JNI Ids are pointers!"; + DCHECK_NE(Runtime::Current()->GetJniIdType(), JniIdType::kPointer) << "JNI Ids are pointers!"; Thread* self = Thread::Current(); ObjPtr<ClassExt> ext(EnsureExtDataPresent(h_this, self)); if (ext.IsNull()) { |