Fixed class linker ResolveType for multi-dimensional arrays.
The functionality of GetComponentType was changed to return the array
type, but one dimension less, instead of returning the basic element
type. Making the code drill all the way down fixes this.
Change-Id: I89f6810a1362bb9d9c06c530d12646eb1375fccb
diff --git a/src/class_linker.cc b/src/class_linker.cc
index eade908..a8703da 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2247,7 +2247,10 @@
resolved = FindClass(descriptor, class_loader);
}
if (resolved != NULL) {
- Class* check = resolved->IsArrayClass() ? resolved->GetComponentType() : resolved;
+ Class* check = resolved;
+ while (check->IsArrayClass()) {
+ check = check->GetComponentType();
+ }
if (dex_cache != check->GetDexCache()) {
if (check->GetClassLoader() != NULL) {
Thread::Current()->ThrowNewExceptionF("Ljava/lang/IllegalAccessError;",