archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 01:24:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8212053: A few more missing object equals barriers

Browse source 
Reviewed-by: shade, zgu
This commit is contained in:
Roman Kennke 2018-10-12 16:25:24 +02:00
parent 96b43418b5
commit f958e6642e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/oops/compressedOops.inline.hpp
View file

@ -66,7 +66,7 @@ namespace CompressedOops {
assert(OopEncodingHeapMax > pd, "change encoding max if new encoding"); assert(OopEncodingHeapMax > pd, "change encoding max if new encoding");
uint64_t result = pd >> shift; uint64_t result = pd >> shift;
assert((result & CONST64(0xffffffff00000000)) == 0, "narrow oop overflow"); assert((result & CONST64(0xffffffff00000000)) == 0, "narrow oop overflow");
assert(decode(result) == v, "reversibility"); assert(oopDesc::equals_raw(decode(result), v), "reversibility");
return (narrowOop)result; return (narrowOop)result;
} }

2
src/hotspot/share/runtime/vframe.cpp
View file

@ -134,7 +134,7 @@ GrowableArray<MonitorInfo*>* javaVFrame::locked_monitors() {
// //
// Skip the monitor that the thread is blocked to enter or waiting on // Skip the monitor that the thread is blocked to enter or waiting on
// //
if (!found_first_monitor && (obj == pending_obj || obj == waiting_obj)) { if (!found_first_monitor && (oopDesc::equals(obj, pending_obj) || oopDesc::equals(obj, waiting_obj))) {
continue; continue;
} }
found_first_monitor = true; found_first_monitor = true;