stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8292077: G1 nmethod entry barriers don't keep oops alive

Browse Source 
Reviewed-by: tschatzl, stefank, vlivanov
This commit is contained in:
Erik Österlund 2022-08-11 11:45:11 +00:00
parent ad5f628c58
commit 1c0f0f4211
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hotspot/share/gc/shared/barrierSetNMethod.cpp
View File

@ -28,8 +28,10 @@
#include "gc/shared/barrierSet.hpp" #include "gc/shared/barrierSet.hpp"
#include "gc/shared/barrierSetAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp"
#include "gc/shared/barrierSetNMethod.hpp" #include "gc/shared/barrierSetNMethod.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "logging/log.hpp" #include "logging/log.hpp"
#include "memory/iterator.hpp" #include "memory/iterator.hpp"
#include "memory/universe.hpp"
#include "oops/access.inline.hpp" #include "oops/access.inline.hpp"
#include "oops/method.inline.hpp" #include "oops/method.inline.hpp"
#include "runtime/frame.inline.hpp" #include "runtime/frame.inline.hpp"
@ -38,14 +40,6 @@
#include "runtime/threads.hpp" #include "runtime/threads.hpp"
#include "utilities/debug.hpp" #include "utilities/debug.hpp"
class LoadPhantomOopClosure : public OopClosure {
public:
virtual void do_oop(oop* p) {
NativeAccess<ON_PHANTOM_OOP_REF>::oop_load(p);
}
virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
};
int BarrierSetNMethod::disarmed_value() const { int BarrierSetNMethod::disarmed_value() const {
return *disarmed_value_address(); return *disarmed_value_address();
} }
@ -67,10 +61,26 @@ bool BarrierSetNMethod::supports_entry_barrier(nmethod* nm) {
} }
bool BarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) { bool BarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
class OopKeepAliveClosure : public OopClosure {
public:
virtual void do_oop(oop* p) {
// Loads on nmethod oops are phantom strength.
//
// Note that we could have used NativeAccess<ON_PHANTOM_OOP_REF>::oop_load(p),
// but that would have *required* us to convert the returned LoadOopProxy to an oop,
// or else keep alive load barrier will never be called. It's the LoadOopProxy-to-oop
// conversion that performs the load barriers. This is too subtle, so we instead
// perform an explicit keep alive call.
oop obj = NativeAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(p);
Universe::heap()->keep_alive(obj);
}
virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
};
// If the nmethod is the only thing pointing to the oops, and we are using a // If the nmethod is the only thing pointing to the oops, and we are using a
// SATB GC, then it is important that this code marks them live. This is done // SATB GC, then it is important that this code marks them live.
// by the phantom load. OopKeepAliveClosure cl;
LoadPhantomOopClosure cl;
nm->oops_do(&cl); nm->oops_do(&cl);
// CodeCache sweeper support // CodeCache sweeper support