RFR(sh/jdk): Fix Windows build

Aleksey Shipilev shade at redhat.com
Tue Jul 7 13:06:23 UTC 2020


On 7/7/20 3:00 PM, rkennke at redhat.com wrote:
> CI found a little type conversion hiccup in my last change to evac-
> locking. Also, one line is a duplicate.
> 
> Testing: hotspot_gc_shenandoah (sorry, no Windows build-machine at
> hand)
> 
> diff -r 1bb1b0d2acce
> src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
> --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp  Mon Jul
> 06 22:43:04 2020 +0200
> +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp  Tue Jul
> 07 14:58:30 2020 +0200
> @@ -610,9 +610,8 @@
>    MaxTLABSizeBytes = MaxTLABSizeWords * HeapWordSize;
>    assert (MaxTLABSizeBytes > MinTLABSize, "should be larger");
>  
> -  size_t locking_card_size = 1 << (ShenandoahEvacLockGranularity +
> LogHeapWordSize);
> +  size_t locking_card_size = ((size_t)1) <<
> (ShenandoahEvacLockGranularity + LogHeapWordSize);
>    if (locking_card_size > RegionSizeBytes) {
> -    size_t locking_card_size = 1 << (ShenandoahEvacLockGranularity +
> LogHeapWordSize);
>      err_msg message("Evac locking card size (" SIZE_FORMAT "%s) should
> be lower than region size (" SIZE_FORMAT "%s).",
>                      byte_size_in_proper_unit(locking_card_size),
> proper_unit_for_byte_size(locking_card_size),
>                      byte_size_in_proper_unit(RegionSizeBytes),   prope
> r_unit_for_byte_size(RegionSizeBytes));
> [

Looks fine.

-- 
Thanks,
-Aleksey



More information about the shenandoah-dev mailing list