commit 36b58f5ebb85d58f8b5966b8577a6dfe720d1e16
author Mathieu Chartier <mathieuc@google.com> Wed Dec 10 12:06:45 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Thu Dec 11 11:07:35 2014 -0800
tree c7eca5ae2a6ceea65a7aa2e489b6ea84efbad1f1
parent 86ff0892aae3b13a105ce2fd58c39591f315c049

Add verifier support for dequickening

Also some cleanup.

Bug: 17950037

Change-Id: I1f50fe07f1558e9c4f78953b7afa639d7f310b3c

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 59efebf..65c5c21 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3408,7 +3408,7 @@
     return nullptr;
   }
   mirror::ArtMethod* res_method = dispatch_class->GetVTableEntry(vtable_index);
-  if (FailOrAbort(this, !Thread::Current()->IsExceptionPending(),
+  if (FailOrAbort(this, !self_->IsExceptionPending(),
                   "Unexpected exception pending for quickened invoke at ",
                   work_insn_idx_)) {
     return nullptr;