commit 207a37dbb8049bdf585d17551c3eb3df685a629f
author Jeff Hao <jeffhao@google.com> Wed Oct 29 17:24:25 2014 -0700
committer Jeff Hao <jeffhao@google.com> Mon Nov 03 14:00:57 2014 -0800
tree 6ddb67ac39641acf3db3f30c9346ea5c264f2b18
parent a338da434433b180c33e043929ea79b18f4c093c

Check null this pointer for direct methods in FindMethodFast.

Also adds regression test 127-secondarydex.

Bug: 18150997

(cherry picked from commit d2bee3dffa2f552512f47bca605ed857e3ae30ea)

Change-Id: I911dd7c92c51939504cfee5a3d18a835987b8388

runtime/entrypoints/entrypoint_utils-inl.h

diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index 670bf2a..f76da8edaa 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -541,8 +541,7 @@
                                                 mirror::Object* this_object,
                                                 mirror::ArtMethod* referrer,
                                                 bool access_check, InvokeType type) {
-  bool is_direct = type == kStatic || type == kDirect;
-  if (UNLIKELY(this_object == NULL && !is_direct)) {
+  if (UNLIKELY(this_object == NULL && type != kStatic)) {
     return NULL;
   }
   mirror::ArtMethod* resolved_method =
@@ -567,7 +566,7 @@
   }
   if (type == kInterface) {  // Most common form of slow path dispatch.
     return this_object->GetClass()->FindVirtualMethodForInterface(resolved_method);
-  } else if (is_direct) {
+  } else if (type == kStatic || type == kDirect) {
     return resolved_method;
   } else if (type == kSuper) {
     return referrer->GetDeclaringClass()->GetSuperClass()