commit af242824dcedbbe39c92b49d148e7ff50267e47f
author Sriram Raman <sriramkraman@google.com> Tue Apr 19 17:17:27 2011 -0400
committer Sriram Raman <sriramkraman@google.com> Tue Apr 19 17:20:07 2011 -0400
tree 4261d93de2741df241d59573b92cb1a6351346a8
parent bdd06aadab6214d2378b7d5078f92bfb14e7e3dc

Revert "Fix a type error in the allocation of non-moving arrays." per Ryan's request

This reverts commit bdd06aadab6214d2378b7d5078f92bfb14e7e3dc.

Change-Id: Ifbb4bd7941fe4f2e9d02ca2b7d77186edae4dd55

vm/native/dalvik_system_VMRuntime.c

diff --git a/vm/native/dalvik_system_VMRuntime.c b/vm/native/dalvik_system_VMRuntime.c
index eb086a8..fec24be 100644
--- a/vm/native/dalvik_system_VMRuntime.c
+++ b/vm/native/dalvik_system_VMRuntime.c
@@ -128,6 +128,7 @@
 {
     ClassObject* elementClass = (ClassObject*) args[1];
     int length = args[2];
+    ArrayObject* newArray;
 
     if (elementClass == NULL) {
         dvmThrowException("Ljava/lang/NullPointerException;", NULL);
@@ -141,10 +142,7 @@
     // TODO: right now, we don't have a copying collector, so there's no need
     // to do anything special here, but we ought to pass the non-movability
     // through to the allocator.
-    ClassObject* arrayClass = dvmFindArrayClassForElement(elementClass);
-    ArrayObject* newArray = dvmAllocArrayByClass(arrayClass,
-                                                 length,
-                                                 ALLOC_DEFAULT);
+    newArray = dvmAllocObjectArray(elementClass, length, ALLOC_DEFAULT);
     if (newArray == NULL) {
         assert(dvmCheckException(dvmThreadSelf()));
         RETURN_VOID();