Skip to content
Permalink
Browse files
8257418: C2: Rename barrier data member in MemNode and LoadStoreNode
Reviewed-by: vlivanov
  • Loading branch information
pliden committed Nov 30, 2020
1 parent c071960 commit e3abe51a31a4dc544f26c9423c67d6f7b916e8a9
Showing with 10 additions and 10 deletions.
  1. +1 −1 src/hotspot/share/opto/memnode.cpp
  2. +9 −9 src/hotspot/share/opto/memnode.hpp
@@ -2956,7 +2956,7 @@ LoadStoreNode::LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const Ty
: Node(required),
_type(rt),
_adr_type(at),
_barrier(0)
_barrier_data(0)
{
init_req(MemNode::Control, c );
init_req(MemNode::Memory , mem);
@@ -43,7 +43,7 @@ class MemNode : public Node {
bool _unaligned_access; // Unaligned access from unsafe
bool _mismatched_access; // Mismatched access from unsafe: byte read in integer array for instance
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:
#ifdef ASSERT
@@ -69,7 +69,7 @@ class MemNode : public Node {
_unaligned_access(false),
_mismatched_access(false),
_unsafe_access(false),
_barrier(0) {
_barrier_data(0) {
init_class_id(Class_Mem);
debug_only(_adr_type=at; adr_type();)
}
@@ -78,7 +78,7 @@ class MemNode : public Node {
_unaligned_access(false),
_mismatched_access(false),
_unsafe_access(false),
_barrier(0) {
_barrier_data(0) {
init_class_id(Class_Mem);
debug_only(_adr_type=at; adr_type();)
}
@@ -87,7 +87,7 @@ class MemNode : public Node {
_unaligned_access(false),
_mismatched_access(false),
_unsafe_access(false),
_barrier(0) {
_barrier_data(0) {
init_class_id(Class_Mem);
debug_only(_adr_type=at; adr_type();)
}
@@ -140,8 +140,8 @@ class MemNode : public Node {
#endif
}

uint8_t barrier_data() { return _barrier; }
void set_barrier_data(uint8_t barrier_data) { _barrier = barrier_data; }
uint8_t barrier_data() { return _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).
// Look for an exact match for the address, with no intervening
@@ -839,7 +839,7 @@ class LoadStoreNode : public Node {
private:
const Type* const _type; // What kind of value is loaded?
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
public:
LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required );
@@ -853,8 +853,8 @@ class LoadStoreNode : public Node {
bool result_not_used() const;
MemBarNode* trailing_membar() const;

uint8_t barrier_data() { return _barrier; }
void set_barrier_data(uint8_t barrier_data) { _barrier = barrier_data; }
uint8_t barrier_data() { return _barrier_data; }
void set_barrier_data(uint8_t barrier_data) { _barrier_data = barrier_data; }
};

class LoadStoreConditionalNode : public LoadStoreNode {

1 comment on commit e3abe51

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on e3abe51 Nov 30, 2020

Please sign in to comment.