RFR: Fix references to G1SATBMarkQueueSet
Roman Kennke
rkennke at redhat.com
Tue Jun 12 08:53:20 UTC 2018
Ok. Thanks!
Roman
> PPC64/S390x builds are failing because they do not account rename SATBMarkQueueSet ->
> G1SATBMarkQueueSet.
>
> Fix:
>
> diff -r 32458bd6e3dc src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
> --- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp Tue Jun 12 09:24:03 2018 +0200
> +++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp Tue Jun 12 09:34:12 2018 +0200
> @@ -458,7 +458,7 @@
> __ mflr(R0);
> __ std(R0, _abi(lr), R1_SP);
> __ push_frame_reg_args(nbytes_save, R0); // dummy frame for C call
> - __ call_VM_leaf(CAST_FROM_FN_PTR(address, SATBMarkQueueSet::handle_zero_index_for_thread),
> R16_thread);
> + __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1SATBMarkQueueSet::handle_zero_index_for_thread),
> R16_thread);
> __ pop_frame();
> __ ld(R0, _abi(lr), R1_SP);
> __ mtlr(R0);
> diff -r 32458bd6e3dc src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
> --- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp Tue Jun 12 09:24:03 2018 +0200
> +++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp Tue Jun 12 09:34:12 2018 +0200
> @@ -520,7 +520,7 @@
> __ bind(refill);
> save_volatile_registers(sasm);
> __ z_lgr(tmp, pre_val); // save pre_val
> - __ call_VM_leaf(CAST_FROM_FN_PTR(address, SATBMarkQueueSet::handle_zero_index_for_thread),
> + __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1SATBMarkQueueSet::handle_zero_index_for_thread),
> Z_thread);
> __ z_lgr(pre_val, tmp); // restore pre_val
> restore_volatile_registers(sasm);
> diff -r 32458bd6e3dc src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp
> --- a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp Tue Jun 12 09:24:03 2018 +0200
> +++ b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp Tue Jun 12 09:34:12 2018 +0200
> @@ -160,7 +160,7 @@
>
> address handle_zero =
> CAST_FROM_FN_PTR(address,
> - &SATBMarkQueueSet::handle_zero_index_for_thread);
> + &G1SATBMarkQueueSet::handle_zero_index_for_thread);
> // This should be rare enough that we can afford to save all the
> // scratch registers that the calling context might be using.
> __ mov(G1_scratch, L0);
> @@ -605,7 +605,7 @@
>
> __ call_VM_leaf(L7_thread_cache,
> CAST_FROM_FN_PTR(address,
> - SATBMarkQueueSet::handle_zero_index_for_thread),
> + G1SATBMarkQueueSet::handle_zero_index_for_thread),
> G2_thread);
>
> __ restore_live_registers(true);
>
>
> Thanks,
> -Aleksey
>
More information about the shenandoah-dev
mailing list