Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.
/ jdk22u Public archive

8331894: [jdk22] compiler/print/CompileCommandMemLimit.java fails after backporting JDK-8325095 #190

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented May 8, 2024

Trivial, but somewhat urgent fix to a jdk-22-only problem brought by an unclean backport of https://bugs.openjdk.org/browse/JDK-8325095.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8331894 needs maintainer approval

Issue

  • JDK-8331894: [jdk22] compiler/print/CompileCommandMemLimit.java fails after backporting JDK-8325095 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 190

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk22u/pull/190.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2024

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

@openjdk
Copy link

openjdk bot commented May 8, 2024

@tstuefe 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:

8331894: [jdk22] compiler/print/CompileCommandMemLimit.java fails after backporting JDK-8325095

Reviewed-by: kvn, shade

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 2 new commits pushed to the master branch:

  • fc18e8a: 8330524: Linux ppc64le compile warning with clang in os_linux_ppc.cpp
  • 7b1ae12: 8325621: Improve jspawnhelper version checks

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot changed the title JDK-8331894: [jdk22] compiler/print/CompileCommandMemLimit.java fails after backporting JDK-8325095 8331894: [jdk22] compiler/print/CompileCommandMemLimit.java fails after backporting JDK-8325095 May 8, 2024
@tstuefe tstuefe force-pushed the JDK-8331894-compiler-print-CompileCommandMemLimit-java-fails-in-CI branch from a9c8059 to ef57fcd Compare May 8, 2024 14:25
@tstuefe tstuefe marked this pull request as ready for review May 8, 2024 15:14
@openjdk openjdk bot added the rfr Pull request is ready for review label May 8, 2024
@mlbridge
Copy link

mlbridge bot commented May 8, 2024

Webrevs

@tstuefe
Copy link
Member Author

tstuefe commented May 8, 2024

@shipilev maybe?

Copy link

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Yes, it is strange that this change was not included.

@openjdk
Copy link

openjdk bot commented May 8, 2024

⚠️ @tstuefe This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@tstuefe
Copy link
Member Author

tstuefe commented May 8, 2024

Thank you, @vnkozlov. I'll wait till the GHAs are thru, then push.

@vnkozlov
Copy link

vnkozlov commented May 8, 2024

This code was added by JDK-8317683 in JDK 22. So only this JDK is affected.

@tstuefe
Copy link
Member Author

tstuefe commented May 9, 2024

All GHAs are green.

/integrate

@openjdk
Copy link

openjdk bot commented May 9, 2024

@tstuefe This pull request has not yet been marked as ready for integration.

@tstuefe
Copy link
Member Author

tstuefe commented May 9, 2024

/approval This patch fixes a simple oversight in the downport of https://bugs.openjdk.org/browse/JDK-8325095.

It must be fixed since the oversight introduced an incorrectness in the compilation memory statistic that the failing test picked up on.

It is low risk, has been manually tested as well as ran through GHAs.

Note that the problem only affects JDK 22. No other release is affected.

@openjdk
Copy link

openjdk bot commented May 9, 2024

@tstuefe usage: /approval [<id>] (request|cancel) [<text>]

@tstuefe
Copy link
Member Author

tstuefe commented May 9, 2024

/approval request This patch fixes a simple oversight in the downport of https://bugs.openjdk.org/browse/JDK-8325095.

It must be fixed since the oversight introduced an incorrectness in the compilation memory statistic that the failing test picked up on.

It is low risk, has been manually tested as well as ran through GHAs.

Note that the problem only affects JDK 22. No other release is affected.

@openjdk
Copy link

openjdk bot commented May 9, 2024

@tstuefe
8331894: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 9, 2024
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch. So I missed this hunk during jdk22u backport? And I have not noticed, because -- in contrast to jdk21u backport -- I have not ran the full test suite for jdk22u, only the basic sanity tests around the change, in order to save testing time.

Looks good, thanks for fixing.

@tstuefe
Copy link
Member Author

tstuefe commented May 14, 2024

Ouch. So I missed this hunk during jdk22u backport? And I have not noticed, because -- in contrast to jdk21u backport -- I have not ran the full test suite for jdk22u, only the basic sanity tests around the change, in order to save testing time.

Looks good, thanks for fixing.

Sure, no problem.

@TobiHartmann
Copy link
Member

@tstuefe Could you please integrate this soon? The failures generate a lot of noise in our testing. Thanks!

@tstuefe
Copy link
Member Author

tstuefe commented May 16, 2024

@TobiHartmann

oops, sorry! I thought I had already.

/integrate

@openjdk
Copy link

openjdk bot commented May 16, 2024

Going to push as commit f1eba2c.
Since your change was applied there have been 16 commits pushed to the master branch:

  • f5ce46f: 8329961: Buffer overflow in os::Linux::kernel_version
  • 0f3b3fa: 8331942: On Linux aarch64, CDS archives should be using 64K alignment by default
  • c3e9084: 8329862: libjli GetApplicationHome cleanups and enhance jli tracing
  • bb3651f: 8331167: UBSan enabled build fails in adlc on macOS
  • 5550682: 8330615: avoid signed integer overflows in zip_util.c readCen / hashN
  • dd5581c: 8331331: :tier1 target explanation in doc/testing.md is incorrect
  • 2cb2e6b: 8325255: jdk.internal.util.ReferencedKeySet::add using wrong test
  • cbfaf28: 8329663: hs_err file event log entry for thread adding/removing should print current thread
  • 61792bc: 8331344: No compiler replay file with CompilerCommand MemLimit
  • 9b3187f: 8330027: Identity hashes of archived objects must be based on a reproducible random seed
  • ... and 6 more: https://git.openjdk.org/jdk22u/compare/8eac95ec3cd4b215556d788b9ade7a6e2f9deaa3...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 16, 2024
@openjdk openjdk bot closed this May 16, 2024
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label May 16, 2024
@openjdk openjdk bot removed the rfr Pull request is ready for review label May 16, 2024
@openjdk
Copy link

openjdk bot commented May 16, 2024

@tstuefe Pushed as commit f1eba2c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants