JDK-8318176: C2: dont assert in ~GraphKit if compilation had been interrupted#16203
Closed
tstuefe wants to merge 1 commit intoopenjdk:masterfrom
Closed
Conversation
|
👋 Welcome back stuefe! A progress list of the required criteria for merging this PR into |
| #ifdef ASSERT | ||
| ~GraphKit() { | ||
| assert(!has_exceptions(), "user must call transfer_exceptions_into_jvms"); | ||
| assert(Compile::current()->failing() || !has_exceptions(), "user must call transfer_exceptions_into_jvms"); |
Member
There was a problem hiding this comment.
Couldn't you just call GraphKit::failing()?
Member
Author
There was a problem hiding this comment.
Possibly. I also realized this can be merged with JDK-8318183 (#16205), so I close this PR and fix the graphkit dtor over there.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If compilation had been interrupted, which may have happened e.g. due to reaching the node limit check, the using code may not have called
GraphKit::transfer_exceptions_into_jvms()yet; in that case, we should not assert.Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16203/head:pull/16203$ git checkout pull/16203Update a local copy of the PR:
$ git checkout pull/16203$ git pull https://git.openjdk.org/jdk.git pull/16203/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 16203View PR using the GUI difftool:
$ git pr show -t 16203Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16203.diff
Webrev
Link to Webrev Comment