commit f4e284fa81141f8c125981ae5d169affd1181fcb
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 04 21:58:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 04 21:58:46 2017 +0000
tree fbcb3b84f880ab9953382828cf18aad8a9ffafc0
parent 367e020d85ee5d3c3c5896a20acb1a7e51a4309a
parent 8ddb7f5c9a3fa2b31e87efcf785a1e427f042bbb

Merge "ART: Reorder null check in verifier"

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 978e51d..be58a57 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -5155,10 +5155,11 @@
   }
   uint32_t field_offset = static_cast<uint32_t>(inst->VRegC_22c());
   ArtField* const f = ArtField::FindInstanceFieldWithOffset(object_type.GetClass(), field_offset);
-  DCHECK_EQ(f->GetOffset().Uint32Value(), field_offset);
   if (f == nullptr) {
     VLOG(verifier) << "Failed to find instance field at offset '" << field_offset
                    << "' from '" << mirror::Class::PrettyDescriptor(object_type.GetClass()) << "'";
+  } else {
+    DCHECK_EQ(f->GetOffset().Uint32Value(), field_offset);
   }
   return f;
 }