diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-30 21:15:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-30 21:15:32 +0000 |
| commit | b379e8d107b9131d9b6c7b48aea01f9866e4047b (patch) | |
| tree | 1eed73cb1dd37de984e8f74b1870e3cf44c24404 /runtime/native | |
| parent | e4e04bbd86d1131b9f380a52a46b1a3b83335d5f (diff) | |
| parent | b74cd29802f364b4cec88f4913fa38ade26b8fab (diff) | |
| download | art-b379e8d107b9131d9b6c7b48aea01f9866e4047b.zip art-b379e8d107b9131d9b6c7b48aea01f9866e4047b.tar.gz art-b379e8d107b9131d9b6c7b48aea01f9866e4047b.tar.bz2 | |
Merge "Compaction cleanup for FindArrayClass."
Diffstat (limited to 'runtime/native')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 5 | ||||
| -rw-r--r-- | runtime/native/java_lang_reflect_Array.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index d55b545..e5cc671 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -67,7 +67,8 @@ static jobject VMRuntime_newNonMovableArray(JNIEnv* env, jobject, jclass javaEle return nullptr; } Runtime* runtime = Runtime::Current(); - mirror::Class* array_class = runtime->GetClassLinker()->FindArrayClass(soa.Self(), element_class); + mirror::Class* array_class = + runtime->GetClassLinker()->FindArrayClass(soa.Self(), &element_class); if (UNLIKELY(array_class == nullptr)) { return nullptr; } @@ -90,7 +91,7 @@ static jobject VMRuntime_newUnpaddedArray(JNIEnv* env, jobject, jclass javaEleme return nullptr; } Runtime* runtime = Runtime::Current(); - mirror::Class* array_class = runtime->GetClassLinker()->FindArrayClass(soa.Self(), element_class); + mirror::Class* array_class = runtime->GetClassLinker()->FindArrayClass(soa.Self(), &element_class); if (UNLIKELY(array_class == nullptr)) { return nullptr; } diff --git a/runtime/native/java_lang_reflect_Array.cc b/runtime/native/java_lang_reflect_Array.cc index db77437..eae4584 100644 --- a/runtime/native/java_lang_reflect_Array.cc +++ b/runtime/native/java_lang_reflect_Array.cc @@ -46,14 +46,14 @@ static jobject Array_createMultiArray(JNIEnv* env, jclass, jclass javaElementCla static jobject Array_createObjectArray(JNIEnv* env, jclass, jclass javaElementClass, jint length) { ScopedFastNativeObjectAccess soa(env); DCHECK(javaElementClass != NULL); - mirror::Class* element_class = soa.Decode<mirror::Class*>(javaElementClass); if (UNLIKELY(length < 0)) { ThrowNegativeArraySizeException(length); return NULL; } + mirror::Class* element_class = soa.Decode<mirror::Class*>(javaElementClass); Runtime* runtime = Runtime::Current(); ClassLinker* class_linker = runtime->GetClassLinker(); - mirror::Class* array_class = class_linker->FindArrayClass(soa.Self(), element_class); + mirror::Class* array_class = class_linker->FindArrayClass(soa.Self(), &element_class); if (UNLIKELY(array_class == NULL)) { CHECK(soa.Self()->IsExceptionPending()); return NULL; |