[jdk21u-dev] RFR: 8310913: Move ReferencedKeyMap to jdk.internal so it may be shared [v2]
Aleksey Shipilev
shade at openjdk.org
Mon Mar 25 10:23:41 UTC 2024
> Unclean backport to match the codebases between mainline and JDK 21, simplifying maintenance. It also implicitly fixes [JDK-8323505](https://bugs.openjdk.org/browse/JDK-8323505), since this move includes a few touchups to the test.
>
> The uncleanliness comes from `MethodType.java` conflicts that does not have [JDK-8310849](https://bugs.openjdk.org/browse/JDK-8310849) in JDK 21. So it yields a few contextual conflicts. Since affected hunks are just removals, I removed them by hand.
>
> There is a follow-up, [JDK-8325255](https://bugs.openjdk.org/browse/JDK-8325255), but it does not seem to affect anything yet, since there are no `ReferenceKeySet.add` calls anywhere in sight. We can backport that separately.
>
> Additional testing:
> - [x] MacOS AArch64 Server fastdebug, `jdk/internal/util` tests pass
> - [x] MacOS AArch64 Server fastdebug, `java/lang/invoke` tests pass
> - [x] Linux AArch64 Server fastdebug, `all` tests pass
Aleksey Shipilev has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains two additional commits since the last revision:
- Merge branch 'master' into JDK-8310913-referenced-key-map
- Backport 6af0af593446bc33dc94bbf7334c325c4ac0ac0f
Reviewed-by: naoto, rriggs, mchung, liach
-------------
Changes:
- all: https://git.openjdk.org/jdk21u-dev/pull/342/files
- new: https://git.openjdk.org/jdk21u-dev/pull/342/files/d95e43c9..62409055
Webrevs:
- full: https://webrevs.openjdk.org/?repo=jdk21u-dev&pr=342&range=01
- incr: https://webrevs.openjdk.org/?repo=jdk21u-dev&pr=342&range=00-01
Stats: 14840 lines in 254 files changed: 6765 ins; 4045 del; 4030 mod
Patch: https://git.openjdk.org/jdk21u-dev/pull/342.diff
Fetch: git fetch https://git.openjdk.org/jdk21u-dev.git pull/342/head:pull/342
PR: https://git.openjdk.org/jdk21u-dev/pull/342
More information about the jdk-updates-dev
mailing list