commit 38aa2b2ea43bafe54dc43e59d819bd8eadb2e7eb
author Ian Rogers <irogers@google.com> Wed Feb 01 11:48:16 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 01 11:48:16 2012 -0800
tree e1596c0f22398a7a272f3a17a263d2b1ca98c617
parent 5a4acce7dfe168b06d041f1faaa0bb279808700d
parent 5d86e52f93ea8d95cdda3ef45bdfc39e14e3898c

Merge "Add verifier assignability for unresolved arrays to Object[]" into dalvik-dev

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 8776458..c03b724 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -209,6 +209,8 @@
           return true;  // all reference types can be assigned to Object
         } else if (!IsUnresolvedTypes() && GetClass()->IsInterface()) {
           return true;  // We allow assignment to any interface, see comment in ClassJoin
+        } else if (IsJavaLangObjectArray()) {
+          return src.IsObjectArray();  // All reference arrays may be assigned to Object[]
         } else if (!IsUnresolvedTypes() && !src.IsUnresolvedTypes() &&
                    GetClass()->IsAssignableFrom(src.GetClass())) {
           // We're assignable from the Class point-of-view

src/dex_verifier.h

diff --git a/src/dex_verifier.h b/src/dex_verifier.h
index 0488ba3..032e777 100644
--- a/src/dex_verifier.h
+++ b/src/dex_verifier.h
@@ -212,6 +212,24 @@
   bool IsJavaLangObject() const {
     return IsReference() && GetClass()->IsObjectClass();
   }
+  bool IsObjectArray() const {
+    if (IsReference()) {
+      Class* type = GetClass();
+      return type->IsArrayClass() && !type->GetComponentType()->IsPrimitive();
+    } else if (IsUnresolvedTypes()) {
+      // Primitive arrays will always resolve
+      DCHECK(GetDescriptor()->CharAt(1) == 'L' || GetDescriptor()->CharAt(1) == '[');
+      return GetDescriptor()->CharAt(0) == '[';
+    }
+    return false;
+  }
+  bool IsJavaLangObjectArray() const {
+    if (IsReference()) {
+      Class* type = GetClass();
+      return type->IsArrayClass() && type->GetComponentType()->IsObjectClass();
+    }
+    return false;
+  }
   bool IsInstantiableTypes() const {
     return IsUnresolvedTypes() || (IsNonZeroReferenceTypes() && GetClass()->IsInstantiable());
   }