Skip to content
Permalink
Browse files
Fix issue with ZGC
  • Loading branch information
pron committed Mar 29, 2021
1 parent 34f8386 commit 0931d17aa88acf527af92552df8be965cfaca62c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
@@ -66,18 +66,15 @@ inline stackChunkOopDesc* stackChunkOopDesc::parent() const { return (st
inline void stackChunkOopDesc::set_parent(stackChunkOopDesc* value) { jdk_internal_misc_StackChunk::set_parent(this, (oop)value); }
template<typename P> inline void stackChunkOopDesc::set_parent_raw(oop value) { jdk_internal_misc_StackChunk::set_parent_raw<P>(this, value); }
template<typename P> inline bool stackChunkOopDesc::is_parent_null() const { return jdk_internal_misc_StackChunk::is_parent_null<P>(const_cast<stackChunkOopDesc*>(this)); }
inline oop stackChunkOopDesc::cont() const { return jdk_internal_misc_StackChunk::cont(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_cont(oop value) { jdk_internal_misc_StackChunk::set_cont(this, value); }
template<typename P> inline void stackChunkOopDesc::set_cont_raw(oop value) { jdk_internal_misc_StackChunk::set_cont_raw<P>(this, value); }
inline int stackChunkOopDesc::stack_size() const { return jdk_internal_misc_StackChunk::size(const_cast<stackChunkOopDesc*>(this)); }
inline int stackChunkOopDesc::sp() const { return jdk_internal_misc_StackChunk::sp(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_sp(int value) { jdk_internal_misc_StackChunk::set_sp(this, value); }
inline address stackChunkOopDesc::pc() const { return (address)jdk_internal_misc_StackChunk::pc(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_pc(address value) { jdk_internal_misc_StackChunk::set_pc(this, (jlong)value); }
inline int stackChunkOopDesc::argsize() const { return jdk_internal_misc_StackChunk::argsize(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_argsize(int value) { jdk_internal_misc_StackChunk::set_argsize(const_cast<stackChunkOopDesc*>(this), value); }
inline uint8_t stackChunkOopDesc::flags() const { return (uint8_t)jdk_internal_misc_StackChunk::flags(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_flags(uint8_t value) { jdk_internal_misc_StackChunk::set_flags(this, (jbyte)value); }
inline uint8_t stackChunkOopDesc::flags() const { return (uint8_t)jdk_internal_misc_StackChunk::flags(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_flags(uint8_t value) { jdk_internal_misc_StackChunk::set_flags(this, (jbyte)value); }
inline int stackChunkOopDesc::max_size() const { return (int)jdk_internal_misc_StackChunk::maxSize(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_max_size(int value) { jdk_internal_misc_StackChunk::set_maxSize(this, (jint)value); }
inline int stackChunkOopDesc::numFrames() const { return jdk_internal_misc_StackChunk::numFrames(const_cast<stackChunkOopDesc*>(this)); }
@@ -91,6 +88,16 @@ inline void stackChunkOopDesc::set_gc_sp(int value) { jdk_internal_misc_Sta
inline uint64_t stackChunkOopDesc::mark_cycle() const { return (uint64_t)jdk_internal_misc_StackChunk::mark_cycle(const_cast<stackChunkOopDesc*>(this)); }
inline void stackChunkOopDesc::set_mark_cycle(uint64_t value) { jdk_internal_misc_StackChunk::set_mark_cycle(this, (jlong)value); }

inline void stackChunkOopDesc::set_cont(oop value) { jdk_internal_misc_StackChunk::set_cont(this, value); }
template<typename P> inline void stackChunkOopDesc::set_cont_raw(oop value) { jdk_internal_misc_StackChunk::set_cont_raw<P>(this, value); }
inline oop stackChunkOopDesc::cont() const { return UseCompressedOops ? cont<narrowOop>() : cont<oop>(); /* jdk_internal_misc_StackChunk::cont(const_cast<stackChunkOopDesc*>(this)); */ }
template<typename P> inline oop stackChunkOopDesc::cont() const {
// this is a special field used to detect GC processing status (see should_fix) and so we don't want to invoke a barrier directly on it
oop obj = jdk_internal_misc_StackChunk::cont_raw<P>(const_cast<stackChunkOopDesc*>(this));
obj = (oop)NativeAccess<>::oop_load(&obj);
return obj;
}

inline int stackChunkOopDesc::end() const { return stack_size() - argsize(); }

inline intptr_t* stackChunkOopDesc::start_address() const { return (intptr_t*)InstanceStackChunkKlass::start_of_stack(const_cast<stackChunkOopDesc*>(this)); }
@@ -53,10 +53,6 @@ class stackChunkOopDesc : public instanceOopDesc {
template<typename P>
inline bool is_parent_null() const;
inline int stack_size() const;
inline oop cont() const;
inline void set_cont(oop value);
template<typename P>
inline void set_cont_raw(oop value);
inline int sp() const;
inline void set_sp(int value);
inline address pc() const;
@@ -78,6 +74,12 @@ class stackChunkOopDesc : public instanceOopDesc {
inline uint64_t mark_cycle() const;
inline void set_mark_cycle(uint64_t value);

inline oop cont() const;
template<typename P> inline oop cont() const;
inline void set_cont(oop value);
template<typename P>
inline void set_cont_raw(oop value);

inline bool is_empty() const;
inline int end() const;
inline intptr_t* start_address() const;

0 comments on commit 0931d17

Please sign in to comment.