Fix verifier checks on interface methods.

We were disallowing interfaces in the IsInheritedMethod even though
the function can be called with them. This could cause some failing
DCHECKS if the verifier cannot find methods in some situations.

We also fixed a small issue in the verifier where we allowed
non-public java.lang.Object methods to be considered valid for
interface dispatch.

Test: ./test.py --host -j50
Test: Compile an app with bad bytecodes (See bug)
Bug: 64158483
Bug: 64274113
Change-Id: Ia79f25be0001efc4069a411a0b34476bd0871803

1 files changed, 13 insertions, 2 deletions

diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 6642869900..c775cf4613 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -464,14 +464,25 @@ ArtMethod* Class::FindInterfaceMethod(ObjPtr<DexCache> dex_cache,
   return FindInterfaceMethod(name, signature, pointer_size);
 }
 
+static inline bool IsValidInheritanceCheck(ObjPtr<mirror::Class> klass,
+                                           ObjPtr<mirror::Class> declaring_class)
+    REQUIRES_SHARED(Locks::mutator_lock_) {
+  if (klass->IsArrayClass()) {
+    return declaring_class->IsObjectClass();
+  } else if (klass->IsInterface()) {
+    return declaring_class->IsObjectClass() || declaring_class == klass;
+  } else {
+    return klass->IsSubClass(declaring_class);
+  }
+}
+
 static inline bool IsInheritedMethod(ObjPtr<mirror::Class> klass,
                                      ObjPtr<mirror::Class> declaring_class,
                                      ArtMethod& method)
     REQUIRES_SHARED(Locks::mutator_lock_) {
   DCHECK_EQ(declaring_class, method.GetDeclaringClass());
   DCHECK_NE(klass, declaring_class);
-  DCHECK(klass->IsArrayClass() ? declaring_class->IsObjectClass()
-                               : klass->IsSubClass(declaring_class));
+  DCHECK(IsValidInheritanceCheck(klass, declaring_class));
   uint32_t access_flags = method.GetAccessFlags();
   if ((access_flags & (kAccPublic | kAccProtected)) != 0) {
     return true;