[lworld+vector] Integrated: Merge lworld

Xiaohong Gong xgong at openjdk.org
Fri Sep 1 05:52:08 UTC 2023


On Wed, 30 Aug 2023 06:04:45 GMT, Xiaohong Gong <xgong at openjdk.org> wrote:

> This patch merges the latest `valhalla:lworld` to
>  `valhalla:lworld+vector` branch, together with following
>  main changes:
> 
> 1. Resolve conflicts mainly caused by the BACKOUT of
>  `VectorShuffle refactory` in jdk mainline [1].
> 2. Fix the class id issue for `SafePointScalarMergeNode` added by [JDK-8287061](https://bugs.openjdk.java.net/browse/JDK-8287061). This causes an jvm crash
>  when building the jdk image. `lworld` branch also
>  fixes it (see [2]), but it seems the id is not correctly
>  ordered.
> 
> [1] https://github.com/openjdk/jdk/pull/14629
> 
> [2] https://github.com/openjdk/valhalla/blob/lworld/src/hotspot/share/opto/node.hpp#L738

This pull request has now been integrated.

Changeset: 0a40ef55
Author:    Xiaohong Gong <xgong at openjdk.org>
URL:       https://git.openjdk.org/valhalla/commit/0a40ef552f1c93f291b11f84d060daa28746d806
Stats:     238118 lines in 3830 files changed: 127006 ins; 91855 del; 19257 mod

Merge lworld

Reviewed-by: jbhateja

-------------

PR: https://git.openjdk.org/valhalla/pull/921



More information about the valhalla-dev mailing list