RFR: Fix build

Aleksey Shipilev shade at redhat.com
Thu Sep 7 19:37:08 UTC 2017


On 09/07/2017 09:32 PM, Roman Kennke wrote:
> The following patch is needed to fix the build (tried slowdebug on
> aarch64 on RHEL 7.4):
> 
> diff -r 90a2a29e9e0c src/share/vm/gc/g1/g1CollectedHeap.inline.hpp
> --- a/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp     Thu Sep 07
> 12:01:54 2017 +0200
> +++ b/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp     Thu Sep 07
> 15:31:39 2017 -0400
> @@ -303,7 +303,7 @@
>      return false;
>    }
> 
> -  assert(oopDesc::is_oop(entry, true /* ignore mark word */),
> +  assert(oopDesc::is_oop(oop(entry), true /* ignore mark word */),
>           "Invalid oop in SATB buffer: " PTR_FORMAT, p2i(entry));
> 
>    return ! isMarkedNext((oop) entry);
> diff -r 90a2a29e9e0c src/share/vm/gc/shenandoah/shenandoahHeapRegion.cpp
> --- a/src/share/vm/gc/shenandoah/shenandoahHeapRegion.cpp       Thu Sep
> 07 12:01:54 2017 +0200
> +++ b/src/share/vm/gc/shenandoah/shenandoahHeapRegion.cpp       Thu Sep
> 07 15:31:39 2017 -0400
> @@ -484,7 +484,7 @@
>        last = cur;
>        cur += oop(cur)->size() + BrooksPointer::word_size();
>      }
> -    assert(oopDesc::is_oop(last),
> +    assert(oopDesc::is_oop(oop(last)),
>             PTR_FORMAT" should be an object start", p2i(last));
>      return last;
>    }
> 
> 
> Ok to push?

Ok.

-Aleksey




More information about the shenandoah-dev mailing list