commit 26c5e1503425cae17f5b16fdf06a2d62ec03a59b
author Elliott Hughes <enh@google.com> Wed Jul 11 11:47:22 2012 -0700
committer Elliott Hughes <enh@google.com> Wed Jul 11 11:47:22 2012 -0700
tree 91e3e62df1b13958b8b73a2ea871ccb877f8162a
parent 5a8e3d5e87aed128837fb84874d18a1f68e63397

Port "Avoid method overriding if its super method is inaccessible" to art.

This is an art equivalent of https://android-review.googlesource.com/#/c/32480/3.

Change-Id: Ifc2cd21e7e92f596bced3eabae4d16f16f4095ef

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 990fb62..2b20aff 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2850,7 +2850,8 @@
       for (; j < actual_count; ++j) {
         Method* super_method = vtable->Get(j);
         super_mh.ChangeMethod(super_method);
-        if (local_mh.HasSameNameAndSignature(&super_mh)) {
+        if (local_mh.HasSameNameAndSignature(&super_mh) &&
+            klass->CanAccessMember(super_method->GetDeclaringClass(), super_method->GetAccessFlags())) {
           // Verify
           if (super_method->IsFinal()) {
             MethodHelper mh(local_method);