RFR: JDK-8222926: Unify cpu related part of shenandoahBarrierSetC1 and fix build when compiler1 is disabled

[Ao Qi]

On Wed, May 8, 2019 at 9:49 PM Aleksey Shipilev <shade at redhat.com> wrote:
>
> On 5/8/19 3:39 PM, Ao Qi wrote:
> > On Wed, May 8, 2019 at 9:32 PM Aleksey Shipilev <shade at redhat.com> wrote:
> >>
> >> On 5/8/19 3:05 PM, Ao Qi wrote:
> >>>> I changed the synopsis for the bug to: "Shenandoah build fails with --with-jvm-features=-compiler1"
> >>>> -- please change it for the changeset you are pushing.
> >>>
> >>> Updated: http://cr.openjdk.java.net/~aoqi/8222926/webrev.05/
> >>>
> >>> I am not a Committers. I need a sponsor:(
> >>
> >> I will sponsor.
>
> The patch does not pass my local builds without precompiled headers and compiler1. This is also
> needed, agree?

Agreed. Sorry for not testing that. Updated:
http://cr.openjdk.java.net/~aoqi/8222926/webrev.06/

Thanks,
Ao Qi


>
> diff -r 0e3ee2061ea7 src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
> --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp   Wed May 08
> 20:57:12 2019 +0800
> +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp   Wed May 08
> 15:46:04 2019 +0200
> @@ -29,12 +29,12 @@
>  #ifdef COMPILER1
>  class LIR_Assembler;
>  class ShenandoahPreBarrierStub;
>  class ShenandoahLoadReferenceBarrierStub;
>  class StubAssembler;
> +#endif
>  class StubCodeGenerator;
> -#endif
>
>  class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
>  private:
>
>    static address _shenandoah_lrb;
> diff -r 0e3ee2061ea7 src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
> --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp   Wed May 08 20:57:12
> 2019 +0800
> +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp   Wed May 08 15:46:04
> 2019 +0200
> @@ -29,12 +29,12 @@
>  #ifdef COMPILER1
>  class LIR_Assembler;
>  class ShenandoahPreBarrierStub;
>  class ShenandoahLoadReferenceBarrierStub;
>  class StubAssembler;
> +#endif
>  class StubCodeGenerator;
> -#endif
>
>  class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
>  private:
>
>    static address _shenandoah_lrb;
>
> --
> -Aleksey
>