[lworld] Integrated: 8272306: [lworld] Fix incorrectly merged code in classListParser.cpp

Ioi Lam iklam at openjdk.java.net
Mon Aug 23 21:12:00 UTC 2021


On Mon, 23 Aug 2021 05:55:31 GMT, Ioi Lam <iklam at openjdk.org> wrote:

> Please review this simple fix (and small clean up) for incorrectly merged code in classListParser.cpp.
> 
> This following shows the difference between valhalla and the JDK mainline after this PR:
> 
> 
> $ wget https://raw.githubusercontent.com/iklam/valhalla/4da52eaf53e531e96e1e6eac460d6209916d6f2f/src/hotspot/share/cds/classListParser.cpp
> $ wget https://raw.githubusercontent.com/iklam/valhalla/a977e73076022958f9da874d029b1bfdba92f7af/src/hotspot/share/cds/classListParser.cpp
> $ diff classListParser.cpp classListParser.cpp.1

This pull request has now been integrated.

Changeset: dd0a9ebe
Author:    Ioi Lam <iklam at openjdk.org>
URL:       https://git.openjdk.java.net/valhalla/commit/dd0a9ebed9b42b6649f628a6c9b63dac28ffc876
Stats:     29 lines in 1 file changed: 3 ins; 14 del; 12 mod

8272306: [lworld] Fix incorrectly merged code in classListParser.cpp

Reviewed-by: dsimms

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

PR: https://git.openjdk.java.net/valhalla/pull/538


More information about the valhalla-dev mailing list