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

8279822: CI: Constant pool entries in error state are not supported #7314

Closed
wants to merge 3 commits into from

Conversation

iwanowww
Copy link

@iwanowww iwanowww commented Feb 1, 2022

Compiler interface doesn't expect to see constant pool entries in error state and crashes when those are encountered.

JDK-8262377 improved handling of class constants in error state (JVM_CONSTANT_UnresolvedClassInError), but there were more cases left unnoticed (CONSTANT_MethodHandle, CONSTANT_MethodType, and CONSTANT_Dynamic).

Proposed fix introduces proper support in CI of unresolved constants in error state and improves handling of such cases in C1/C2.

Also, for CONSTANT_MethodHandle it turned out that some of LinkageErrors don't transition relevant CP entry into error state (leaving it in unresolved state forever). The fix addresses it.

Testing: hs-tier1 - hs-tier6


Progress

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

Issue

  • JDK-8279822: CI: Constant pool entries in error state are not supported

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7314

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 1, 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 openjdk bot added rfr Pull request is ready for review hotspot-compiler hotspot-compiler-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org labels Feb 1, 2022
@openjdk
Copy link

openjdk bot commented Feb 1, 2022

@iwanowww
The hotspot-compiler label was successfully added.

The hotspot-runtime label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Feb 1, 2022

Webrevs

Copy link
Contributor

@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 fine to me but please explain in PR description what you fixed and how.

@openjdk
Copy link

openjdk bot commented Feb 1, 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:

8279822: CI: Constant pool entries in error state are not supported

Reviewed-by: kvn, thartmann

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

  • 83d6745: 8281450: Remove unnecessary operator new and delete from ObjectMonitor
  • f5d8ceb: 8281296: Create a regression test for JDK-4515999
  • 861f279: 8280917: Simplify G1ConcurrentRefineThread activation
  • f2a9627: 8279329: Remove hardcoded IPv4 available policy on Windows
  • 4eacacb: 8281314: Rename Stack{Red,Yellow,Reserved,Shadow}Pages multipliers
  • 2f71a6b: 8279613: JFR: Snippify Javadoc
  • 8a66210: 6779701: Wrong defect ID in the code of test LocalRMIServerSocketFactoryTest.java
  • 1dfc94d: 8281377: Remove vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java from problemlist.
  • 2ed1f4c: 8281175: Add a -providerPath option to jarsigner
  • a0f6f24: 8280890: Cannot use '-Djava.system.class.loader' with class loader in signed JAR
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/42e272e181f188c89fa88f144715f19235943fca...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 1, 2022
@iwanowww
Copy link
Author

iwanowww commented Feb 1, 2022

Vladimir, thanks for the review. I updated the description. (I intended to create a draft PR, but erroneously published it.)

Copy link
Member

@TobiHartmann TobiHartmann 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 to me.

@iwanowww
Copy link
Author

iwanowww commented Feb 9, 2022

Thanks for the reviews, Vladimir and Tobias.

/integrate

@openjdk
Copy link

openjdk bot commented Feb 9, 2022

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

  • f823bed: 8280007: Enable Neoverse N1 optimizations for Arm Neoverse V1 & N2
  • 8b384b9: 8281470: tools/jar/CreateMissingParentDirectories.java fails with "Should have failed creating jar file"
  • bb2e10c: 8281274: deal with ActiveProcessorCount in os::Linux::print_container_info
  • 69e390a: 8262721: Add Tests to verify single iteration loops are properly optimized
  • f092bab: 8281195: Mistakenly used logging causes significant overhead in interpreter
  • f924e50: 8281440: AWT: Conversion from string literal loses const qualifier
  • 072e7b4: 8272807: Permit use of memory concurrent with pretouch
  • cb2f8ca: 8281338: NSAccessibilityPressAction action for tree node and NSAccessibilityShowMenuAcgtion action not working
  • fc77217: 8281168: Micro-optimize VarForm.getMemberName for interpreter
  • bce5dd1: 8280438: Improve BufferNode::Allocator::release to avoid walking pending list
  • ... and 29 more: https://git.openjdk.java.net/jdk/compare/42e272e181f188c89fa88f144715f19235943fca...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 9, 2022

@iwanowww Pushed as commit c5c8c06.

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