Skip to content

Merge jdk:jdk-28+0#324

Open
TimPushkin wants to merge 372 commits into
openjdk:cracfrom
TimPushkin:merge-jdk-28+0
Open

Merge jdk:jdk-28+0#324
TimPushkin wants to merge 372 commits into
openjdk:cracfrom
TimPushkin:merge-jdk-28+0

Conversation

@TimPushkin

@TimPushkin TimPushkin commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator

Merges jdk-28+0.

Notable parts:

  • JDK-8383881 and JDK-8384869 removed CPU_FLUSH, CPU_MMX, made CPU_SSE, CPU_SSE2 mandatory (FLUSH is also now mandatory but without an enum) — I dropped CRaC code that used CPU_FLUSH, inlined the only CPU_MMX check we had, made CPU_SSE, CPU_SSE2 mandatory in -XX:CPUFeatures, updated hardcoded CPU features values in tests
  • JDK-8382030 and JDK-8385011 enabled ARM64 testing on Windows and Linux which uncovered pre-existing bugs with our CPU features code for ARM64 — this is to be fixed separately, probably by 8385815: [CRaC] Fix aarch64 failing testcases #321
  • JDK-8382582 removed JVMCI (the whole feature, I was surprised), so many small conflicts with CPU features and recompilations
  • Removed IgnoreCPUFeatures that expires in this release

Output of git show --remerge-diff: https://gist.github.com/TimPushkin/1af925f55f841431c87aa31099925b43 — I dropped contents of JVMCI files that were fully removed because they are huge and of no interest.



Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/crac.git pull/324/head:pull/324
$ git checkout pull/324

Update a local copy of the PR:
$ git checkout pull/324
$ git pull https://git.openjdk.org/crac.git pull/324/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 324

View PR using the GUI difftool:
$ git pr show -t 324

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/crac/pull/324.diff

Using Webrev

Link to Webrev Comment

prrace and others added 30 commits May 11, 2026 16:33
Reviewed-by: jsjolen, shade, pchilanomate
Reviewed-by: jlu, naoto
…w feature enabled

Co-authored-by: David Beaumont <[email protected]>
Reviewed-by: jpai, coleenp, sgehwolf
Reviewed-by: kdnilsen, rkennke
…void type when annotating void as a generic bound

Reviewed-by: jlahoda
…ization.java

Reviewed-by: mchevalier, epeter
…CardBarrier.java fails with -Xcomp after JDK-8369013

Reviewed-by: cslucas, wkemper
Reviewed-by: mullan
…at is returned when socket is closed

Reviewed-by: dfuchs, michaelm
…sages could be improved

Reviewed-by: clanger, alanb
…med out

Reviewed-by: cjplummer, lmesnik, kevinw
krk and others added 22 commits June 3, 2026 13:45
…ver::solve

Reviewed-by: chagedorn, snatarajan
…rs causing endless concurrent cycles

Co-authored-by: Thomas Schatzl <[email protected]>
Reviewed-by: tschatzl, aboldtch
Reviewed-by: mdoerr, dbriemann, fyang
…specify behavior when arguments are null or out of bounds

Reviewed-by: kizune, psadhukhan
…buntu_24.04

Remove .../unix/UnixMultiResolutionSplashTest.java

Reviewed-by: syan, prr
…ile in the presence of special constants

Reviewed-by: qamai, epeter, syan, jbhateja
Added tag jdk-28+0 for changeset f8f7ad2
@bridgekeeper

bridgekeeper Bot commented Jun 12, 2026

Copy link
Copy Markdown

👋 Welcome back tpushkin! A progress list of the required criteria for merging this PR into crac will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@TimPushkin

Copy link
Copy Markdown
Collaborator Author

The CI failures are unrelated:

  • Build failures on windows-x64 — known issue JDK-8386551, fixed in the mainline just today, didn't make it into the tag being merged
  • CPU features tests on ARM64 platforms — as described above, to be fixed separately
  • jdk/crac/SecureRandom/InterlockTest — known issue

@openjdk

openjdk Bot commented Jun 12, 2026

Copy link
Copy Markdown

@TimPushkin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge jdk:jdk-28+0

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the crac branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the crac branch, type /integrate in a new comment.

@TimPushkin

TimPushkin commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator Author

@jankratochvil, almost all conflicts are CPU-features-related, please review.

Also I didn't run the manual CPUFeaturesAWS test. The hardcoded values I changed there were calculated manually, same way as for the other tests.

@TimPushkin TimPushkin requested a review from rvansa June 12, 2026 16:24
@openjdk openjdk Bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 12, 2026
@mlbridge

mlbridge Bot commented Jun 12, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.