infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-18 17:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

8354446: [BACKOUT] Remove friends for ObjectMonitor

Browse Source 
Reviewed-by: pchilanomate
This commit is contained in:
Coleen Phillimore 2025-04-11 19:59:52 +00:00
parent 1d7138fe02
commit d14e84c03b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/runtime/objectMonitor.hpp
View File

@ -148,6 +148,9 @@ class ObjectWaiter : public CHeapObj<mtThread> {
#define OM_CACHE_LINE_SIZE DEFAULT_CACHE_LINE_SIZE
class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
friend class LightweightSynchronizer;
friend class ObjectSynchronizer;
friend class ObjectWaiter;
friend class VMStructs;
JVMCI_ONLY(friend class JVMCIVMStructs;)
@ -421,12 +424,13 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
bool short_fixed_spin(JavaThread* current, int spin_count, bool adapt);
void exit_epilog(JavaThread* current, ObjectWaiter* Wakee);
public:
// Deflation support
bool deflate_monitor(Thread* current);
private:
void install_displaced_markword_in_object(const oop obj);
// JFR support
public:
static bool is_jfr_excluded(const Klass* monitor_klass);
};

5
src/hotspot/share/runtime/synchronizer.cpp
View File

@ -423,8 +423,7 @@ bool ObjectSynchronizer::quick_enter_legacy(oop obj, BasicLock* lock, JavaThread
// Case: TLE inimical operations such as nested/recursive synchronization
if (m->has_owner(current)) {
int recursions = m->recursions();
m->set_recursions(++recursions);
m->_recursions++;
current->inc_held_monitor_count();
return true;
}
@ -441,7 +440,7 @@ bool ObjectSynchronizer::quick_enter_legacy(oop obj, BasicLock* lock, JavaThread
lock->set_displaced_header(markWord::unused_mark());
if (!m->has_owner() && m->try_set_owner(current)) {
assert(m->recursions() == 0, "invariant");
assert(m->_recursions == 0, "invariant");
current->inc_held_monitor_count();
return true;
}