commit 3e49ad8b18c8dcaa842d9bfa503d61af022d8286
author Ian Rogers <irogers@google.com> Wed Nov 02 15:10:12 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 15:10:12 2011 -0700
tree e43799187f85218b5dbd39e49107a2a86271ca6c
parent f944a855ded0185d21f29a715e8afbdd5df1262b
parent f4028cce202a328a99db4014ad096caa4b6f2432

Merge "Support for unresolved fields in the verifier." into dalvik-dev

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 9f66250..5ab21bb 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -3291,9 +3291,9 @@
   Field* field = Runtime::Current()->GetClassLinker()->ResolveField(field_idx, method_, true);
   if (field == NULL) {
     const DexFile::FieldId& field_id = dex_file_->GetFieldId(field_idx);
-    Fail(VERIFY_ERROR_NO_FIELD) << "unable to resolve static field " << field_idx << " ("
-                                << dex_file_->GetFieldName(field_id) << ") in "
-                                << dex_file_->GetFieldDeclaringClassDescriptor(field_id);
+    LOG(INFO) << "unable to resolve static field " << field_idx << " ("
+              << dex_file_->GetFieldName(field_id) << ") in "
+              << dex_file_->GetFieldDeclaringClassDescriptor(field_id);
     DCHECK(Thread::Current()->IsExceptionPending());
     Thread::Current()->ClearException();
     return NULL;
@@ -3314,9 +3314,9 @@
   Field* field = Runtime::Current()->GetClassLinker()->ResolveField(field_idx, method_, false);
   if (field == NULL) {
     const DexFile::FieldId& field_id = dex_file_->GetFieldId(field_idx);
-    Fail(VERIFY_ERROR_NO_FIELD) << "unable to resolve instance field " << field_idx << " ("
-                                << dex_file_->GetFieldName(field_id) << ") in "
-                                << dex_file_->GetFieldDeclaringClassDescriptor(field_id);
+    LOG(INFO) << "unable to resolve instance field " << field_idx << " ("
+              << dex_file_->GetFieldName(field_id) << ") in "
+              << dex_file_->GetFieldDeclaringClassDescriptor(field_id);
     DCHECK(Thread::Current()->IsExceptionPending());
     Thread::Current()->ClearException();
     return NULL;
@@ -3355,17 +3355,28 @@
 
 void DexVerifier::VerifyISGet(const Instruction::DecodedInstruction& dec_insn,
                               const RegType& insn_type, bool is_primitive, bool is_static) {
+  uint32_t field_idx = is_static ? dec_insn.vB_ : dec_insn.vC_;
   Field* field;
   if (is_static) {
-    field = GetStaticField(dec_insn.vB_);
+    field = GetStaticField(field_idx);
   } else {
     const RegType& object_type = work_line_->GetRegisterType(dec_insn.vB_);
-    field = GetInstanceField(object_type, dec_insn.vC_);
+    field = GetInstanceField(object_type, field_idx);
   }
-  if (field != NULL) {
-    const RegType& field_type =
-        reg_types_.FromDescriptor(field->GetDeclaringClass()->GetClassLoader(),
-                                  field->GetTypeDescriptor());
+  if (failure_ != VERIFY_ERROR_NONE) {
+    work_line_->SetRegisterType(dec_insn.vA_, reg_types_.Unknown());
+  } else {
+    const char* descriptor;
+    const ClassLoader* loader;
+    if (field != NULL) {
+      descriptor = field->GetTypeDescriptor();
+      loader = field->GetDeclaringClass()->GetClassLoader();
+    } else {
+      const DexFile::FieldId& field_id = dex_file_->GetFieldId(field_idx);
+      descriptor = dex_file_->GetFieldTypeDescriptor(field_id);
+      loader = method_->GetDeclaringClass()->GetClassLoader();
+    }
+    const RegType& field_type = reg_types_.FromDescriptor(loader, descriptor);
     if (is_primitive) {
       if (field_type.Equals(insn_type) ||
           (field_type.IsFloat() && insn_type.IsIntegralTypes()) ||