summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2020-04-21 14:01:44 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 2020-04-24 10:29:22 +0000
commitafa69cd7985a7e438077deffb46b2ac2cf52770d (patch)
tree6872330bc41b84e1ea7841e893e23f344f1f06f9
parent9b78924a29f9eedc8eaf4d3b173d4f0567cb7504 (diff)
Add another DCHECK that an exception isn't pending.
The code assumes there should not be any - it's unclear if that's the case, but add a DCHECK to diagnose. Test: test.py Bug: 73760543 Change-Id: If9c89261f1f1dfc4d4966ea89474d8a2ee224452
-rw-r--r--runtime/class_linker.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 86ff666fb8..8f8f4fdbc0 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -8779,6 +8779,8 @@ ArtMethod* ClassLinker::ResolveMethod(uint32_t method_idx,
// We normaly should not end up here. However the verifier currently doesn't guarantee
// the invariant of having the klass in the class table. b/73760543
klass = ResolveType(method_id.class_idx_, dex_cache, class_loader);
+ DCHECK(!Thread::Current()->IsExceptionPending())
+ << Thread::Current()->GetException()->Dump();
}
} else {
// The method was not in the DexCache, resolve the declaring class.