commit 91c3bf88a2182cfc496fc2a8e453e99dddbf9778
author Alex Light <allight@google.com> Wed Mar 29 11:33:19 2017 -0700
committer Alex Light <allight@google.com> Wed Mar 29 17:41:23 2017 -0700
tree 6f8bb5251515c094b3a30eaccbd4260d07946263
parent 27e771c3263c688b4f970f08d780aff7b8f1756b

Downgrade another duplicate method DCHECK to WARNING

This DCHECK got missed when writing change
'Ib26f30718726a9064056855192cef302f3df1eeb'. This is also caused by
duplicate methods in dex files causing some ArtMethod's to appear in
vtables more than once.

Bug: 32549051
Bug: 32546154
Bug: 36446088
Bug: 36399552

Test: ./test/testrunner/testrunner.py --host -j40
Change-Id: Id8ef07d7185958a91f008c2297db96c090dbecd7
(cherry picked from commit a41a3078bb222cdee837243eb5adc73ac980e73e)

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index f936db9..3c18704 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -6723,10 +6723,11 @@
     ArtMethod* m = check_vtable->GetElementPtrSize<ArtMethod*>(i, pointer_size);
     CHECK(m != nullptr);
 
-    CHECK_EQ(m->GetMethodIndexDuringLinking(), i)
-        << m->PrettyMethod()
-        << " has an unexpected method index for its spot in the vtable for class"
-        << klass->PrettyClass();
+    if (m->GetMethodIndexDuringLinking() != i) {
+      LOG(WARNING) << m->PrettyMethod()
+                   << " has an unexpected method index for its spot in the vtable for class"
+                   << klass->PrettyClass();
+    }
     ArraySlice<ArtMethod> virtuals = klass->GetVirtualMethodsSliceUnchecked(pointer_size);
     auto is_same_method = [m] (const ArtMethod& meth) {
       return &meth == m;