archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8204969: Asserts in objArrayKlass.cpp need to use _raw variants of obj_addr_at()

Browse source 
Reviewed-by: tschatzl, eosterlund
This commit is contained in:
Roman Kennke 2018-08-09 17:11:11 +02:00
parent 437a15817f
commit f62fa67625
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/hotspot/share/oops/objArrayKlass.cpp
View file

@ -312,17 +312,17 @@ void ObjArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d,
size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(src_pos); 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); size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(dst_pos);
assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(s, src_offset, NULL) == 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) == 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); do_copy(s, src_offset, d, dst_offset, length, CHECK);
} else { } else {
size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(src_pos); 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); size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(dst_pos);
assert(arrayOopDesc::obj_offset_to_raw<oop>(s, src_offset, NULL) == 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) == 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); do_copy(s, src_offset, d, dst_offset, length, CHECK);
} }
} }