diff options
Diffstat (limited to 'runtime/native')
| -rw-r--r-- | runtime/native/java_lang_System.cc | 28 | ||||
| -rw-r--r-- | runtime/native/sun_misc_Unsafe.cc | 24 |
2 files changed, 32 insertions, 20 deletions
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc index 2c4184c285..e4bc8ce5a2 100644 --- a/runtime/native/java_lang_System.cc +++ b/runtime/native/java_lang_System.cc @@ -101,32 +101,36 @@ static void System_arraycopy(JNIEnv* env, jclass, jobject javaSrc, jint srcPos, case Primitive::kPrimBoolean: case Primitive::kPrimByte: DCHECK_EQ(Primitive::ComponentSize(dstComponentPrimitiveType), 1U); - dstArray->AsByteSizedArray()->Memmove(dstPos, srcArray->AsByteSizedArray(), srcPos, count); + // Note: Treating BooleanArray as ByteArray. + ObjPtr<mirror::ByteArray>::DownCast(dstArray)->Memmove( + dstPos, ObjPtr<mirror::ByteArray>::DownCast(srcArray), srcPos, count); return; case Primitive::kPrimChar: case Primitive::kPrimShort: DCHECK_EQ(Primitive::ComponentSize(dstComponentPrimitiveType), 2U); - dstArray->AsShortSizedArray()->Memmove(dstPos, srcArray->AsShortSizedArray(), srcPos, count); + // Note: Treating CharArray as ShortArray. + ObjPtr<mirror::ShortArray>::DownCast(dstArray)->Memmove( + dstPos, ObjPtr<mirror::ShortArray>::DownCast(srcArray), srcPos, count); return; case Primitive::kPrimInt: - DCHECK_EQ(Primitive::ComponentSize(dstComponentPrimitiveType), 4U); - dstArray->AsIntArray()->Memmove(dstPos, srcArray->AsIntArray(), srcPos, count); - return; case Primitive::kPrimFloat: DCHECK_EQ(Primitive::ComponentSize(dstComponentPrimitiveType), 4U); - dstArray->AsFloatArray()->Memmove(dstPos, srcArray->AsFloatArray(), srcPos, count); + // Note: Treating FloatArray as IntArray. + ObjPtr<mirror::IntArray>::DownCast(dstArray)->Memmove( + dstPos, ObjPtr<mirror::IntArray>::DownCast(srcArray), srcPos, count); return; case Primitive::kPrimLong: - DCHECK_EQ(Primitive::ComponentSize(dstComponentPrimitiveType), 8U); - dstArray->AsLongArray()->Memmove(dstPos, srcArray->AsLongArray(), srcPos, count); - return; case Primitive::kPrimDouble: DCHECK_EQ(Primitive::ComponentSize(dstComponentPrimitiveType), 8U); - dstArray->AsDoubleArray()->Memmove(dstPos, srcArray->AsDoubleArray(), srcPos, count); + // Note: Treating DoubleArray as LongArray. + ObjPtr<mirror::LongArray>::DownCast(dstArray)->Memmove( + dstPos, ObjPtr<mirror::LongArray>::DownCast(srcArray), srcPos, count); return; case Primitive::kPrimNot: { - mirror::ObjectArray<mirror::Object>* dstObjArray = dstArray->AsObjectArray<mirror::Object>(); - mirror::ObjectArray<mirror::Object>* srcObjArray = srcArray->AsObjectArray<mirror::Object>(); + mirror::ObjectArray<mirror::Object>* dstObjArray = + dstArray->AsObjectArray<mirror::Object>(); + mirror::ObjectArray<mirror::Object>* srcObjArray = + srcArray->AsObjectArray<mirror::Object>(); dstObjArray->AssignableMemmove(dstPos, srcObjArray, srcPos, count); return; } diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc index a739c2d16e..5014f340cd 100644 --- a/runtime/native/sun_misc_Unsafe.cc +++ b/runtime/native/sun_misc_Unsafe.cc @@ -366,13 +366,17 @@ static void Unsafe_copyMemoryToPrimitiveArray(JNIEnv *env, ObjPtr<mirror::Object> dst = soa.Decode<mirror::Object>(dstObj); ObjPtr<mirror::Class> component_type = dst->GetClass()->GetComponentType(); if (component_type->IsPrimitiveByte() || component_type->IsPrimitiveBoolean()) { - copyToArray(srcAddr, MakeObjPtr(dst->AsByteSizedArray()), dst_offset, sz); + // Note: Treating BooleanArray as ByteArray. + copyToArray(srcAddr, ObjPtr<mirror::ByteArray>::DownCast(dst), dst_offset, sz); } else if (component_type->IsPrimitiveShort() || component_type->IsPrimitiveChar()) { - copyToArray(srcAddr, MakeObjPtr(dst->AsShortSizedArray()), dst_offset, sz); + // Note: Treating CharArray as ShortArray. + copyToArray(srcAddr, ObjPtr<mirror::ShortArray>::DownCast(dst), dst_offset, sz); } else if (component_type->IsPrimitiveInt() || component_type->IsPrimitiveFloat()) { - copyToArray(srcAddr, MakeObjPtr(dst->AsIntArray()), dst_offset, sz); + // Note: Treating FloatArray as IntArray. + copyToArray(srcAddr, ObjPtr<mirror::IntArray>::DownCast(dst), dst_offset, sz); } else if (component_type->IsPrimitiveLong() || component_type->IsPrimitiveDouble()) { - copyToArray(srcAddr, MakeObjPtr(dst->AsLongArray()), dst_offset, sz); + // Note: Treating DoubleArray as LongArray. + copyToArray(srcAddr, ObjPtr<mirror::LongArray>::DownCast(dst), dst_offset, sz); } else { ThrowIllegalAccessException("not a primitive array"); } @@ -397,13 +401,17 @@ static void Unsafe_copyMemoryFromPrimitiveArray(JNIEnv *env, ObjPtr<mirror::Object> src = soa.Decode<mirror::Object>(srcObj); ObjPtr<mirror::Class> component_type = src->GetClass()->GetComponentType(); if (component_type->IsPrimitiveByte() || component_type->IsPrimitiveBoolean()) { - copyFromArray(dstAddr, MakeObjPtr(src->AsByteSizedArray()), src_offset, sz); + // Note: Treating BooleanArray as ByteArray. + copyFromArray(dstAddr, ObjPtr<mirror::ByteArray>::DownCast(src), src_offset, sz); } else if (component_type->IsPrimitiveShort() || component_type->IsPrimitiveChar()) { - copyFromArray(dstAddr, MakeObjPtr(src->AsShortSizedArray()), src_offset, sz); + // Note: Treating CharArray as ShortArray. + copyFromArray(dstAddr, ObjPtr<mirror::ShortArray>::DownCast(src), src_offset, sz); } else if (component_type->IsPrimitiveInt() || component_type->IsPrimitiveFloat()) { - copyFromArray(dstAddr, MakeObjPtr(src->AsIntArray()), src_offset, sz); + // Note: Treating FloatArray as IntArray. + copyFromArray(dstAddr, ObjPtr<mirror::IntArray>::DownCast(src), src_offset, sz); } else if (component_type->IsPrimitiveLong() || component_type->IsPrimitiveDouble()) { - copyFromArray(dstAddr, MakeObjPtr(src->AsLongArray()), src_offset, sz); + // Note: Treating DoubleArray as LongArray. + copyFromArray(dstAddr, ObjPtr<mirror::LongArray>::DownCast(src), src_offset, sz); } else { ThrowIllegalAccessException("not a primitive array"); } |