ART: Remove workaround for bug 34659969.
The workaround is unnecessary since
https://android-review.googlesource.com/423760 .
Test: m test-art-host-gtest
Test: testrunner.py --host
Bug: 34659969
Change-Id: I47010ea95879457fdc6af6f9809a40ed209f8e38
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index cd7a94e..9776ea1 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -7708,12 +7708,6 @@
Thread::PoisonObjectPointersIfDebug();
ObjPtr<mirror::Class> resolved = dex_cache->GetResolvedType(type_idx);
if (resolved == nullptr) {
- // TODO: Avoid this lookup as it duplicates work done in FindClass(). It is here
- // as a workaround for FastNative JNI to avoid AssertNoPendingException() when
- // trying to resolve annotations while an exception may be pending. Bug: 34659969
- resolved = LookupResolvedType(dex_file, type_idx, dex_cache.Get(), class_loader.Get());
- }
- if (resolved == nullptr) {
Thread* self = Thread::Current();
const char* descriptor = dex_file.StringByTypeIdx(type_idx);
resolved = FindClass(self, descriptor, class_loader);