Add verifier assignability for unresolved arrays to Object[]
Change-Id: Ie98a013cf8f9a28b073152c60774b549cdc83364
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