Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8204969: Asserts in objArrayKlass.cpp need to use _raw variants of obj_addr_at()
authorrkennke
Thu, 09 Aug 2018 17:11:11 +0200
changeset 51349 343f580476d6
parent 51348 3d4292720da3
child 51350 57565f7dcb2a
8204969: Asserts in objArrayKlass.cpp need to use _raw variants of obj_addr_at() Reviewed-by: tschatzl, eosterlund
src/hotspot/share/oops/objArrayKlass.cpp file | annotate | diff | comparison | revisions 
--- 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);
   }
 }
jdk-sandbox