diff options
Diffstat (limited to 'runtime/art_method-inl.h')
| -rw-r--r-- | runtime/art_method-inl.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h index 685e26c78d..5cf0e0f90c 100644 --- a/runtime/art_method-inl.h +++ b/runtime/art_method-inl.h @@ -32,6 +32,7 @@ #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array.h" +#include "mirror/string.h" #include "oat.h" #include "obj_ptr-inl.h" #include "quick/quick_method_frame_info.h" @@ -56,8 +57,10 @@ inline mirror::Class* ArtMethod::GetDeclaringClass() { if (!IsRuntimeMethod()) { CHECK(result != nullptr) << this; if (kCheckDeclaringClassState) { - CHECK(result->IsIdxLoaded() || result->IsErroneous()) - << result->GetStatus() << " " << result->PrettyClass(); + if (!(result->IsIdxLoaded() || result->IsErroneous())) { + LOG(FATAL_WITHOUT_ABORT) << "Class status: " << result->GetStatus(); + LOG(FATAL) << result->PrettyClass(); + } } } else { CHECK(result == nullptr) << this; @@ -347,7 +350,11 @@ inline const char* ArtMethod::GetDeclaringClassSourceFile() { inline uint16_t ArtMethod::GetClassDefIndex() { DCHECK(!IsProxyMethod()); - return GetDeclaringClass()->GetDexClassDefIndex(); + if (LIKELY(!IsObsolete())) { + return GetDeclaringClass()->GetDexClassDefIndex(); + } else { + return FindObsoleteDexClassDefIndex(); + } } inline const DexFile::ClassDef& ArtMethod::GetClassDef() { |