Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Node* BarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) con
Node* control = control_dependent ? opt_access.ctl() : nullptr;
MergeMemNode* mm = opt_access.mem();
PhaseGVN& gvn = opt_access.gvn();
Node* mem = mm->memory_at(gvn.C->get_alias_index(gvn.type(adr)->isa_ptr()));
Node* mem = mm->memory_at(gvn.C->get_alias_index(access.addr().type()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get rid of all uses of access.addr().type()?

load = LoadNode::make(gvn, control, mem, adr, val_type, access.type(), mo, dep,
requires_atomic_access, unaligned, mismatched, unsafe, access.barrier_data());
load = gvn.transform(load);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void CardTableBarrierSetC2::post_barrier(GraphKit* kit,

// Combine card table base and card offset
Node* card_adr = __ AddP(__ top(), byte_map_base_node(kit), card_offset);
int adr_type = Compile::AliasIdxRaw;

// Dirty card value to store
Node* dirty = __ ConI(CardTable::dirty_card_val());

Expand Down