[aarch64-port-dev ] [RFR] [8u] 8u252-b05 Upstream Sync

[Aleksey Shipilev]

On 3/4/20 8:17 PM, Andrew Hughes wrote:
> Merge changesets:
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/corba/merge.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/jaxp/merge.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/jaxws/merge.changeset

Looks trivially good.

> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/jdk/merge.changeset

Looks good.

> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/hotspot/merge.changeset

Looks good.

> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/langtools/merge.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/nashorn/merge.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u252-b05/root/merge.changeset

Looks trivially good.

> Main issues of note:
>   - Two merge conflicts
>      - src/share/vm/code/debugInfo.cpp: changes are applied to
> ConstantOopWriteValue::write_on_impl rather than
> CanstantOopWriteValue::write_on due to "[backport] Workaround C1
> ConstantOopWriteValue bug"

Yes, it is done appropriately for now. We would clean that mess up in sh/jdk8u and integrate back.

>      - src/share/vm/opto/type.cpp: slight context difference due to
> presence of TypeAryPtr::cast_to_nonconst in aarch64/shenandoah-jdk8u

That source of merge conflicts would be removed when we integrate sh/jdk8u:
  https://hg.openjdk.java.net/shenandoah/jdk8/hotspot/rev/ed1dc6cce765


> Ok to push?

Yes.


-- 
Thanks,
-Aleksey