Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

dalvik: Commit

dalvik


Commit MetaInfo

Revision6bc44b183d2e62baf8bed9e1a46827d361106d3d (tree)
Time2011-11-06 02:26:28
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86

Change Summary

Incremental Difference

--- a/vm/native/dalvik_system_VMRuntime.c
+++ b/vm/native/dalvik_system_VMRuntime.c
@@ -128,7 +128,6 @@ static void Dalvik_dalvik_system_VMRuntime_newNonMovableArray(const u4* args,
128128 {
129129 ClassObject* elementClass = (ClassObject*) args[1];
130130 int length = args[2];
131- ArrayObject* newArray;
132131
133132 if (elementClass == NULL) {
134133 dvmThrowException("Ljava/lang/NullPointerException;", NULL);
@@ -142,7 +141,10 @@ static void Dalvik_dalvik_system_VMRuntime_newNonMovableArray(const u4* args,
142141 // TODO: right now, we don't have a copying collector, so there's no need
143142 // to do anything special here, but we ought to pass the non-movability
144143 // through to the allocator.
145- newArray = dvmAllocObjectArray(elementClass, length, ALLOC_DEFAULT);
144+ ClassObject* arrayClass = dvmFindArrayClassForElement(elementClass);
145+ ArrayObject* newArray = dvmAllocArrayByClass(arrayClass,
146+ length,
147+ ALLOC_DEFAULT);
146148 if (newArray == NULL) {
147149 assert(dvmCheckException(dvmThreadSelf()));
148150 RETURN_VOID();
Show on old repository browser