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

8257418: C2: Rename barrier data member in MemNode and LoadStoreNode

Browse Source 
Reviewed-by: vlivanov
This commit is contained in:
Per Liden 2020-11-30 14:15:43 +00:00
parent c0719605e7
commit e3abe51a31
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/opto/memnode.cpp
View File

@ -2956,7 +2956,7 @@ LoadStoreNode::LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const Ty
: Node(required), : Node(required),
_type(rt), _type(rt),
_adr_type(at), _adr_type(at),
_barrier(0) _barrier_data(0)
{ {
init_req(MemNode::Control, c ); init_req(MemNode::Control, c );
init_req(MemNode::Memory , mem); init_req(MemNode::Memory , mem);

18
src/hotspot/share/opto/memnode.hpp
View File

@ -43,7 +43,7 @@ private:
bool _unaligned_access; // Unaligned access from unsafe bool _unaligned_access; // Unaligned access from unsafe
bool _mismatched_access; // Mismatched access from unsafe: byte read in integer array for instance bool _mismatched_access; // Mismatched access from unsafe: byte read in integer array for instance
bool _unsafe_access; // Access of unsafe origin. bool _unsafe_access; // Access of unsafe origin.
uint8_t _barrier; // Bit field with barrier information uint8_t _barrier_data; // Bit field with barrier information
protected: protected:
#ifdef ASSERT #ifdef ASSERT
@ -69,7 +69,7 @@ protected:
_unaligned_access(false), _unaligned_access(false),
_mismatched_access(false), _mismatched_access(false),
_unsafe_access(false), _unsafe_access(false),
_barrier(0) { _barrier_data(0) {
init_class_id(Class_Mem); init_class_id(Class_Mem);
debug_only(_adr_type=at; adr_type();) debug_only(_adr_type=at; adr_type();)
} }
@ -78,7 +78,7 @@ protected:
_unaligned_access(false), _unaligned_access(false),
_mismatched_access(false), _mismatched_access(false),
_unsafe_access(false), _unsafe_access(false),
_barrier(0) { _barrier_data(0) {
init_class_id(Class_Mem); init_class_id(Class_Mem);
debug_only(_adr_type=at; adr_type();) debug_only(_adr_type=at; adr_type();)
} }
@ -87,7 +87,7 @@ protected:
_unaligned_access(false), _unaligned_access(false),
_mismatched_access(false), _mismatched_access(false),
_unsafe_access(false), _unsafe_access(false),
_barrier(0) { _barrier_data(0) {
init_class_id(Class_Mem); init_class_id(Class_Mem);
debug_only(_adr_type=at; adr_type();) debug_only(_adr_type=at; adr_type();)
} }
@ -140,8 +140,8 @@ public:
#endif #endif
} }
uint8_t barrier_data() { return _barrier; } uint8_t barrier_data() { return _barrier_data; }
void set_barrier_data(uint8_t barrier_data) { _barrier = barrier_data; } void set_barrier_data(uint8_t barrier_data) { _barrier_data = barrier_data; }
// Search through memory states which precede this node (load or store). // Search through memory states which precede this node (load or store).
// Look for an exact match for the address, with no intervening // Look for an exact match for the address, with no intervening
@ -839,7 +839,7 @@ class LoadStoreNode : public Node {
private: private:
const Type* const _type; // What kind of value is loaded? const Type* const _type; // What kind of value is loaded?
const TypePtr* _adr_type; // What kind of memory is being addressed? const TypePtr* _adr_type; // What kind of memory is being addressed?
uint8_t _barrier; // Bit field with barrier information uint8_t _barrier_data; // Bit field with barrier information
virtual uint size_of() const; // Size is bigger virtual uint size_of() const; // Size is bigger
public: public:
LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required ); LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required );
@ -853,8 +853,8 @@ public:
bool result_not_used() const; bool result_not_used() const;
MemBarNode* trailing_membar() const; MemBarNode* trailing_membar() const;
uint8_t barrier_data() { return _barrier; } uint8_t barrier_data() { return _barrier_data; }
void set_barrier_data(uint8_t barrier_data) { _barrier = barrier_data; } void set_barrier_data(uint8_t barrier_data) { _barrier_data = barrier_data; }
}; };
class LoadStoreConditionalNode : public LoadStoreNode { class LoadStoreConditionalNode : public LoadStoreNode {