OpenJDK / jdk-updates / jdk12u
changeset 51349:343f580476d6
8204969: Asserts in objArrayKlass.cpp need to use _raw variants of obj_addr_at()
Reviewed-by: tschatzl, eosterlund
| author | rkennke |
|---|---|
| date | Thu, 09 Aug 2018 17:11:11 +0200 |
| parents | 3d4292720da3 |
| children | 57565f7dcb2a |
| files | src/hotspot/share/oops/objArrayKlass.cpp |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/oops/objArrayKlass.cpp Thu Aug 09 08:02:20 2018 -0700 +++ b/src/hotspot/share/oops/objArrayKlass.cpp Thu Aug 09 17:11:11 2018 +0200 @@ -312,17 +312,17 @@ size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(src_pos); size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(dst_pos); assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(s, src_offset, NULL) == - objArrayOop(s)->obj_at_addr<narrowOop>(src_pos), "sanity"); + objArrayOop(s)->obj_at_addr_raw<narrowOop>(src_pos), "sanity"); assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(d, dst_offset, NULL) == - objArrayOop(d)->obj_at_addr<narrowOop>(dst_pos), "sanity"); + objArrayOop(d)->obj_at_addr_raw<narrowOop>(dst_pos), "sanity"); do_copy(s, src_offset, d, dst_offset, length, CHECK); } else { size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(src_pos); size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(dst_pos); assert(arrayOopDesc::obj_offset_to_raw<oop>(s, src_offset, NULL) == - objArrayOop(s)->obj_at_addr<oop>(src_pos), "sanity"); + objArrayOop(s)->obj_at_addr_raw<oop>(src_pos), "sanity"); assert(arrayOopDesc::obj_offset_to_raw<oop>(d, dst_offset, NULL) == - objArrayOop(d)->obj_at_addr<oop>(dst_pos), "sanity"); + objArrayOop(d)->obj_at_addr_raw<oop>(dst_pos), "sanity"); do_copy(s, src_offset, d, dst_offset, length, CHECK); } }