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

8257415: ZGC: Fix barrier_data types

Browse Source 
Reviewed-by: smonteith, stefank
This commit is contained in:
Per Liden 2020-12-01 10:40:46 +00:00
parent aa2d36f6de
commit 021dced22a
4 changed files with 7 additions and 7 deletions
src/hotspot
cpu
aarch64/gc/z
z_aarch64.ad
x86/gc/z
z_x86_64.ad
share/gc/z/c2
zBarrierSetC2.cppzBarrierSetC2.hpp

2
src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad

@ -30,7 +30,7 @@ source_hpp %{
source %{
static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) {
static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
if (barrier_data == ZLoadBarrierElided) {
return;
}

2
src/hotspot/cpu/x86/gc/z/z_x86_64.ad

@ -32,7 +32,7 @@ source %{
#include "c2_intelJccErratum_x86.hpp"
static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) {
static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
if (barrier_data == ZLoadBarrierElided) {
return; // Elided.
}

4
src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp

@ -83,7 +83,7 @@ static ZBarrierSetC2State* barrier_set_state() {
return reinterpret_cast<ZBarrierSetC2State*>(Compile::current()->barrier_set_state());
}
ZLoadBarrierStubC2* ZLoadBarrierStubC2::create(const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) {
ZLoadBarrierStubC2* ZLoadBarrierStubC2::create(const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
ZLoadBarrierStubC2* const stub = new (Compile::current()->comp_arena()) ZLoadBarrierStubC2(node, ref_addr, ref, tmp, barrier_data);
if (!Compile::current()->output()->in_scratch_emit_size()) {
barrier_set_state()->stubs()->append(stub);
@ -92,7 +92,7 @@ ZLoadBarrierStubC2* ZLoadBarrierStubC2::create(const MachNode* node, Address ref
return stub;
}
ZLoadBarrierStubC2::ZLoadBarrierStubC2(const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) :
ZLoadBarrierStubC2::ZLoadBarrierStubC2(const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) :
_node(node),
_ref_addr(ref_addr),
_ref(ref),

6
src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp

@ -41,14 +41,14 @@ private:
const Address _ref_addr;
const Register _ref;
const Register _tmp;
const int _barrier_data;
const uint8_t _barrier_data;
Label _entry;
Label _continuation;
ZLoadBarrierStubC2(const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data);
ZLoadBarrierStubC2(const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data);
public:
static ZLoadBarrierStubC2* create(const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data);
static ZLoadBarrierStubC2* create(const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data);
Address ref_addr() const;
Register ref() const;