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

8280473: CI: Support unresolved JVM_CONSTANT_Dynamic constant pool entries #7423

Closed
wants to merge 2 commits into from

Conversation

iwanowww
Copy link

@iwanowww iwanowww commented Feb 10, 2022

Properly support unresolved CONSTANT_Dynamic CP entries in C1/C2.

Right now, both compilers bail out the compilation when they encounter a single unresolved dynamic constant. It forces users to do eager resolution which defeats the whole purpose of using dynamic constants.

The patch is focused on C1 and enables code patching for dynamic constants, but there are minor C2-specific changes to avoid compilation bailouts there.

Testing: hs-tier1 - hs-tier4


Progress

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

Issue

  • JDK-8280473: CI: Support unresolved JVM_CONSTANT_Dynamic constant pool entries

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7423

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 10, 2022

👋 Welcome back vlivanov! 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 Feb 10, 2022

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Feb 10, 2022
@iwanowww iwanowww marked this pull request as ready for review February 10, 2022 13:19
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 10, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 10, 2022

Webrevs

@eirbjo
Copy link
Contributor

eirbjo commented Feb 10, 2022

Not a review, but I've tested this and can confirm it resolves the bailout issue as reported in the mail thread linked to in JDK-8280473.

@iwanowww
Copy link
Author

Thanks for validating the fix, Eirik.

Copy link
Member

@dean-long dean-long left a comment

Choose a reason for hiding this comment

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

Looks reasonable. I just had a few questions (inline comments).

@openjdk
Copy link

openjdk bot commented Feb 10, 2022

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

8280473: CI: Support unresolved JVM_CONSTANT_Dynamic constant pool entries

Reviewed-by: dlong, redestad, neliasso

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

  • 9d0a4c3: 8274238: Inconsistent type for young_list_target_length()
  • 2604a88: 8281585: Remove unused imports under test/lib and jtreg/gc
  • 534e557: 8256368: Avoid repeated upcalls into Java to re-resolve MH/VH linkers/invokers
  • 95f198b: 8274980: Improve adhoc build version strings
  • c61d629: 8281553: Ensure we only require liveness from mach-nodes with barriers
  • 2597206: 8280783: Parallel: Refactor PSCardTable::scavenge_contents_parallel
  • 2632d40: 8281637: Remove unused VerifyOption_G1UseNextMarking
  • 46f5229: 8281539: IGV: schedule approximation computes immediate dominators wrongly
  • 1ef45c5: 8280799: С2: assert(false) failed: cyclic dependency prevents range check elimination
  • 483d4b9: 8281505: Add CompileCommand PrintIdealPhase
  • ... and 29 more: https://git.openjdk.java.net/jdk/compare/3ce1c5b6ce02749ef8f9d35409b7bcbf27f47203...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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 10, 2022
Copy link
Member

@cl4es cl4es left a comment

Choose a reason for hiding this comment

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

Looks great!

Copy link

@neliasso neliasso 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!

@iwanowww
Copy link
Author

Thanks for the reviews, Dean, Claes, and Nils.

/integrate

@openjdk
Copy link

openjdk bot commented Feb 14, 2022

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

  • f07b816: 8280940: gtest os.release_multi_mappings_vm is racy
  • 9d0a4c3: 8274238: Inconsistent type for young_list_target_length()
  • 2604a88: 8281585: Remove unused imports under test/lib and jtreg/gc
  • 534e557: 8256368: Avoid repeated upcalls into Java to re-resolve MH/VH linkers/invokers
  • 95f198b: 8274980: Improve adhoc build version strings
  • c61d629: 8281553: Ensure we only require liveness from mach-nodes with barriers
  • 2597206: 8280783: Parallel: Refactor PSCardTable::scavenge_contents_parallel
  • 2632d40: 8281637: Remove unused VerifyOption_G1UseNextMarking
  • 46f5229: 8281539: IGV: schedule approximation computes immediate dominators wrongly
  • 1ef45c5: 8280799: С2: assert(false) failed: cyclic dependency prevents range check elimination
  • ... and 30 more: https://git.openjdk.java.net/jdk/compare/3ce1c5b6ce02749ef8f9d35409b7bcbf27f47203...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 14, 2022
@openjdk openjdk bot closed this Feb 14, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 14, 2022
@openjdk
Copy link

openjdk bot commented Feb 14, 2022

@iwanowww Pushed as commit 88fc3bf.

💡 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-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
5 participants