commit 03da784d893a784572cc8b18c503e85fb387a3b9
author Andreas Gampe <agampe@google.com> Thu Apr 12 11:12:52 2018 -0700
committer Andreas Gampe <agampe@google.com> Thu Apr 12 11:12:52 2018 -0700
tree 16cc1a942788c53fd58341247c35f9f6f11ba71d
parent fe6cf7cb0865cc1710d14ff8a41817794e965ea5

ART: Fix oatdump check

Resolution may not be possible, e.g., for missing superclasses.
Weaken a CHECK.

Test: mmma art
Change-Id: I3992c4e10c03a11918a355c36c6b954845c420b0

oatdump/oatdump.cc

diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 7530a9c..6a68b55 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -1714,7 +1714,10 @@
       CHECK(dex_cache != nullptr);
       ArtMethod* method = runtime->GetClassLinker()->ResolveMethodWithoutInvokeType(
           dex_method_idx, dex_cache, *options_.class_loader_);
-      CHECK(method != nullptr);
+      if (method == nullptr) {
+        soa.Self()->ClearException();
+        return nullptr;
+      }
       return verifier::MethodVerifier::VerifyMethodAndDump(
           soa.Self(), vios, dex_method_idx, dex_file, dex_cache, *options_.class_loader_,
           class_def, code_item, method, method_access_flags);