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

8229258: Rework markOop and markOopDesc into a simpler mark word value carrier

Browse source 
Reviewed-by: rkennke, coleenp, kbarrett, dcubed
This commit is contained in:
Stefan Karlsson 2019-08-06 10:48:21 +02:00
parent f075a3278b
commit ae5615c614
132 changed files with 1215 additions and 1236 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/hotspot/share/oops/oop.hpp
View file

@ -28,6 +28,7 @@
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
#include "oops/access.hpp"
#include "oops/markOop.hpp"
#include "oops/metadata.hpp"
#include "runtime/atomic.hpp"
#include "utilities/macros.hpp"
@ -55,24 +56,24 @@ class oopDesc {
friend class VMStructs;
friend class JVMCIVMStructs;
private:
volatile markOop _mark;
volatile markWord _mark;
union _metadata {
Klass* _klass;
narrowKlass _compressed_klass;
} _metadata;
public:
inline markOop mark() const;
inline markOop mark_raw() const;
inline markOop* mark_addr_raw() const;
inline markWord mark() const;
inline markWord mark_raw() const;
inline markWord* mark_addr_raw() const;
inline void set_mark(volatile markOop m);
inline void set_mark_raw(volatile markOop m);
static inline void set_mark_raw(HeapWord* mem, markOop m);
inline void set_mark(volatile markWord m);
inline void set_mark_raw(volatile markWord m);
static inline void set_mark_raw(HeapWord* mem, markWord m);
inline void release_set_mark(markOop m);
inline markOop cas_set_mark(markOop new_mark, markOop old_mark);
inline markOop cas_set_mark_raw(markOop new_mark, markOop old_mark, atomic_memory_order order = memory_order_conservative);
inline void release_set_mark(markWord m);
inline markWord cas_set_mark(markWord new_mark, markWord old_mark);
inline markWord cas_set_mark_raw(markWord new_mark, markWord old_mark, atomic_memory_order order = memory_order_conservative);
// Used only to re-initialize the mark word (e.g., of promoted
// objects during a GC) -- requires a valid klass pointer
@ -266,13 +267,13 @@ class oopDesc {
inline bool is_forwarded() const;
inline void forward_to(oop p);
inline bool cas_forward_to(oop p, markOop compare, atomic_memory_order order = memory_order_conservative);
inline bool cas_forward_to(oop p, markWord compare, atomic_memory_order order = memory_order_conservative);
// Like "forward_to", but inserts the forwarding pointer atomically.
// Exactly one thread succeeds in inserting the forwarding pointer, and
// this call returns "NULL" for that thread; any other thread has the
// value of the forwarding pointer returned and does not modify "this".
inline oop forward_to_atomic(oop p, markOop compare, atomic_memory_order order = memory_order_conservative);
inline oop forward_to_atomic(oop p, markWord compare, atomic_memory_order order = memory_order_conservative);
inline oop forwardee() const;
inline oop forwardee_acquire() const;
@ -308,9 +309,9 @@ class oopDesc {
intptr_t slow_identity_hash();
// marks are forwarded to stack when object is locked
inline bool has_displaced_mark_raw() const;
inline markOop displaced_mark_raw() const;
inline void set_displaced_mark_raw(markOop m);
inline bool has_displaced_mark_raw() const;
inline markWord displaced_mark_raw() const;
inline void set_displaced_mark_raw(markWord m);
static bool has_klass_gap();