commit b067ac2fe225c76fc9eb9434ef62cbb797bfa425
author Ian Rogers <irogers@google.com> Tue Dec 13 18:05:09 2011 -0800
committer Ian Rogers <irogers@google.com> Wed Dec 14 07:03:49 2011 -0800
tree 7afaac5b70dbcc2515f769b0d000240b1f20f4ab
parent 91250e0c3fb0ad758b9b97042a3fa86d5ae76763

Fix for 073-mismatched-field test

ART distinguishes between static and instance field resolution whereas
Java doesn't. Interface static fields bind more closely than those of
superclasses. Implement field resolution code for the verifier so that
it can determine incompatible class change errors when a static field
binds before an instance field.
Also don't search all iftable interfaces, search them in superclass
order (as the specification dictates).

Change-Id: I43b45bada8b9099ad805b244be10833d59bacfe3

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 46a5bec..e002917 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -3304,7 +3304,7 @@
 }
 
 Field* DexVerifier::GetStaticField(int field_idx) {
-  Field* field = Runtime::Current()->GetClassLinker()->ResolveField(field_idx, method_, true);
+  Field* field = Runtime::Current()->GetClassLinker()->ResolveFieldJLS(field_idx, method_);
   if (field == NULL) {
     const DexFile::FieldId& field_id = dex_file_->GetFieldId(field_idx);
     LOG(INFO) << "unable to resolve static field " << field_idx << " ("
@@ -3327,7 +3327,7 @@
 }
 
 Field* DexVerifier::GetInstanceField(const RegType& obj_type, int field_idx) {
-  Field* field = Runtime::Current()->GetClassLinker()->ResolveField(field_idx, method_, false);
+  Field* field = Runtime::Current()->GetClassLinker()->ResolveFieldJLS(field_idx, method_);
   if (field == NULL) {
     const DexFile::FieldId& field_id = dex_file_->GetFieldId(field_idx);
     LOG(INFO) << "unable to resolve instance field " << field_idx << " ("