commit be6fa5eb4a571e14481cf43f4cb264629c069153
author Brian Carlstrom <bdc@google.com> Tue Dec 09 20:15:42 2014 -0800
committer Brian Carlstrom <bdc@google.com> Tue Dec 09 22:35:06 2014 -0800
tree c7a7aa7642fc08941f9d149de5f0e664b67a6f65
parent b1a38e246cfbfb21100d9c9e57f33970e824f075

Fix verifier bug caused by confusing ArtMethod::IsDirect vs ArtMethod::IsStatic semantics.

Bug: 18485243
Change-Id: I011872446490628b51fb38a353abd1d499cc1290

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index c206b94..441a08a 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3168,7 +3168,7 @@
   }
   // See if the method type implied by the invoke instruction matches the access flags for the
   // target method.
-  if ((method_type == METHOD_DIRECT && !res_method->IsDirect()) ||
+  if ((method_type == METHOD_DIRECT && (!res_method->IsDirect() || res_method->IsStatic())) ||
       (method_type == METHOD_STATIC && !res_method->IsStatic()) ||
       ((method_type == METHOD_VIRTUAL || method_type == METHOD_INTERFACE) && res_method->IsDirect())
       ) {