| commit | f368882656cce265d732cba237fac7bc312934a6 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Mar 25 15:04:03 2020 +0000 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Thu Mar 26 14:20:58 2020 +0000 |
| tree | 157fc1c36079d64f065d2a46d955f3d96ba5e352 | |
| parent | aacb4b84078eacbee31f168676750ca73514217e [diff] [blame] |
Add more debugging info around ResolveField. To better diagnose the DCHECK that we have hit here: https://android-build.googleplex.com/builds/git_master-art-host-linux-art-jit/6325844/logs/build.log Test: test.py Change-Id: If160b74055c27cd02bde27e29c7e7f731c458f4d
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index c3e630f..d46f93d 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc
@@ -8875,6 +8875,7 @@ Handle<mirror::ClassLoader> class_loader, bool is_static) { DCHECK(dex_cache != nullptr); + DCHECK(!Thread::Current()->IsExceptionPending()) << Thread::Current()->GetException()->Dump(); ArtField* resolved = dex_cache->GetResolvedField(field_idx, image_pointer_size_); Thread::PoisonObjectPointersIfDebug(); if (resolved != nullptr) {