commit 22e59fd2861a4aab16adb2b80a1d5166382a6617
author Andreas Gampe <agampe@google.com> Wed Jul 23 20:18:36 2014 -0700
committer Andreas Gampe <agampe@google.com> Sat Jul 26 18:31:46 2014 -0700
tree b684129932ff398958985248abe9a6607c4e4b9b
parent 0237ac84b1459cb1718dce23f3572ae2fe1bd77e

ART: Allow arrays with erroneous component type

Array classes must tolerate having component type classes that are
erroneous. Change CreateArrayClass to use LookupClass when FindClass
failed.

Bug: 16019155

(cherry picked from commit dc13d7df5da49e93963035633a82699c68fa0971)

Change-Id: I506250949a1802898433e9099dcb8ef31dd89659

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 617f4bd..1ea42bb 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2398,7 +2398,14 @@
   Handle<mirror::Class> component_type(hs.NewHandle(FindClass(self, descriptor + 1, class_loader)));
   if (component_type.Get() == nullptr) {
     DCHECK(self->IsExceptionPending());
-    return nullptr;
+    // We need to accept erroneous classes as component types.
+    component_type.Assign(LookupClass(descriptor + 1, class_loader.Get()));
+    if (component_type.Get() == nullptr) {
+      DCHECK(self->IsExceptionPending());
+      return nullptr;
+    } else {
+      self->ClearException();
+    }
   }
   if (UNLIKELY(component_type->IsPrimitiveVoid())) {
     ThrowNoClassDefFoundError("Attempt to create array of void primitive type");