ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-08 14:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

allow copies between object arrays of different types in System.arraycopy

Browse Source
This commit is contained in:
Joel Dice 2009-06-04 17:19:48 -06:00
parent 98be5c509e
commit db09adc0d4
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/builtin.cpp
View File

@ -61,6 +61,16 @@ enumerateThreads(Thread* t, Thread* x, object array, unsigned* index,
} }
} }
bool
compatibleArrayTypes(Thread* t, object a, object b)
{
return classArrayElementSize(t, a)
and classArrayElementSize(t, b)
and (a == b
or (not ((classVmFlags(t, a) & PrimitiveFlag)
or (classVmFlags(t, b) & PrimitiveFlag))));
}
} // namespace } // namespace
extern "C" JNIEXPORT int64_t JNICALL extern "C" JNIEXPORT int64_t JNICALL
@ -528,7 +538,9 @@ Avian_java_lang_System_arraycopy
int32_t length = arguments[4]; int32_t length = arguments[4];
if (LIKELY(src and dst)) { if (LIKELY(src and dst)) {
if (LIKELY(objectClass(t, src) == objectClass(t, dst))) { if (LIKELY(compatibleArrayTypes
(t, objectClass(t, src), objectClass(t, dst))))
{
unsigned elementSize = classArrayElementSize(t, objectClass(t, src)); unsigned elementSize = classArrayElementSize(t, objectClass(t, src));
if (LIKELY(elementSize)) { if (LIKELY(elementSize)) {