Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8274718: runtime/cds/appcds/LambdaEagerInit.java fails with -XX:-CompactStrings #5906

Closed
wants to merge 3 commits into from

Conversation

fmatte1
Copy link

@fmatte1 fmatte1 commented Oct 12, 2021

This test uses the default CDS archive with -Xshare:on. However, the default CDS archive may fail to load when a few VM flags are mismatched.
Using -Xshare:auto instead of -Xshare:on for testDefaultArchiveWithEagerInitializationEnabled() and testDefaultArchiveWithEagerInitializationDisabled() method calls


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274718: runtime/cds/appcds/LambdaEagerInit.java fails with -XX:-CompactStrings

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5906/head:pull/5906
$ git checkout pull/5906

Update a local copy of the PR:
$ git checkout pull/5906
$ git pull https://git.openjdk.java.net/jdk pull/5906/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5906

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5906.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 12, 2021

👋 Welcome back fmatte! 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 openjdk bot added the rfr label Oct 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@fmatte1 The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime label Oct 12, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 12, 2021

Webrevs

output.shouldMatch(lambdaLoadedFromArchive)
.shouldMatch(cdsLoadedLambdaProxy)
.shouldHaveExitValue(0);
output.shouldHaveExitValue(0);
Copy link
Member

@iklam iklam Oct 12, 2021

Choose a reason for hiding this comment

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

I think you can do this to keep the checks on lines 130 .. 131:

            .addSuffix("-showversion", mainClass);
        OutputAnalyzer output = CDSTestUtils.runWithArchive(runOpts);
        if (output.getStderr().contains("sharing")) {
            output.shouldMatch(lambdaLoadedFromArchive)
                  .shouldMatch(cdsLoadedLambdaProxy);
        }

Copy link
Author

@fmatte1 fmatte1 Oct 13, 2021

Choose a reason for hiding this comment

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

Thanks, Ioi for the review.

iklam
iklam approved these changes Oct 13, 2021
Copy link
Member

@iklam iklam left a comment

LGTM

@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

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

8274718: runtime/cds/appcds/LambdaEagerInit.java fails with -XX:-CompactStrings

Reviewed-by: iklam, ccheung

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

  • 337b73a: 8274851: [PPC64] Port zgc to linux on ppc64le
  • cf82867: 8275049: [ZGC] missing null check in ZNMethod::log_register
  • ab34cce: 8275186: Suppress warnings on non-serializable array component types in xml
  • b1b8350: 8275171: ProblemList compiler/codegen/aes/TestAESMain.java on linux-x64 and windows-x64 in -Xcomp mode
  • 03c2b73: 8275128: Build hsdis using normal build system
  • 124f823: 8268764: Use Long.hashCode() instead of int-cast where applicable
  • 8657f77: 8271514: support JFR use of new ThreadsList::Iterator
  • b8bd259: 8271737: Only normalize the cached user.dir property once
  • 89999f7: 8275131: Exceptions after a touchpad gesture on macOS
  • 07b1f1c: 8274548: (fc) FileChannel gathering write fails with IOException "Invalid argument" on macOS 11.6
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/cfe7471f1769eca2a4e623f5ba9cddceb005f0bf...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@iklam, @calvinccheung) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Oct 13, 2021
Copy link
Member

@calvinccheung calvinccheung left a comment

Looks good.
One nit: please update the copyright year before integrate.

@fmatte1
Copy link
Author

@fmatte1 fmatte1 commented Oct 13, 2021

Thanks, Ioi and Calvin for the reviews.

@fmatte1
Copy link
Author

@fmatte1 fmatte1 commented Oct 13, 2021

/integrate

@iklam and @calvinccheung one of you please sponsor this push.
Thanks,

@openjdk openjdk bot added the sponsor label Oct 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

@fmatte1
Your change (at version b614ef0) is now ready to be sponsored by a Committer.

@iklam
Copy link
Member

@iklam iklam commented Oct 13, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

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

  • 451a296: 8275173: testlibrary_tests/ir_framework/tests/TestCheckedTests.java fails after JDK-8274911
  • 5ffb5d1: 8272992: Replace usages of Collections.sort with List.sort call in jdk.* modules
  • b8cb76a: 8273682: Upgrade Jline to 3.20.0
  • dcf428c: 8275075: Remove unnecessary conversion to String in jdk.hotspot.agent
  • c3b75c6: 8274516: [REDO] JDK-8271880: Tighten condition for excluding regions from collecting cards with cross-references
  • 337b73a: 8274851: [PPC64] Port zgc to linux on ppc64le
  • cf82867: 8275049: [ZGC] missing null check in ZNMethod::log_register
  • ab34cce: 8275186: Suppress warnings on non-serializable array component types in xml
  • b1b8350: 8275171: ProblemList compiler/codegen/aes/TestAESMain.java on linux-x64 and windows-x64 in -Xcomp mode
  • 03c2b73: 8275128: Build hsdis using normal build system
  • ... and 14 more: https://git.openjdk.java.net/jdk/compare/cfe7471f1769eca2a4e623f5ba9cddceb005f0bf...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Oct 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

@iklam @fmatte1 Pushed as commit d8f6b6c.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
3 participants