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

8257231: assert(!is_mcall || (call_returns[block->_pre_order] <= (uint) current_offset)) #1537

Closed
wants to merge 1 commit into from

Conversation

@phedlin
Copy link
Member

@phedlin phedlin commented Dec 1, 2020

The assert is executed directly after an emit-function that might have resulted in failure, and prior to the necessary error/failure detection. Moving the assert till after the failure exit solves the issue.


Progress

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

Issue

  • JDK-8257231: assert(!is_mcall || (call_returns[block->_pre_order] <= (uint) current_offset))

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1537/head:pull/1537
$ git checkout pull/1537

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 1, 2020

👋 Welcome back phedlin! 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.

Loading

@openjdk openjdk bot added the rfr label Dec 1, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 1, 2020

@phedlin 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.

Loading

@phedlin
Copy link
Member Author

@phedlin phedlin commented Dec 1, 2020

Testing performed on failing test-case: open/test/jdk/java/lang/invoke/PermuteArgsTest.java (using -XX:+StressCodeBuffers)

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 1, 2020

Webrevs

Loading

Copy link
Contributor

@shipilev shipilev left a comment

Right. Seems obvious in hindsight to me.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Dec 1, 2020

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

8257231: assert(!is_mcall || (call_returns[block->_pre_order] <= (uint) current_offset))

Reviewed-by: shade, chagedorn

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 26 new commits pushed to 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.

Loading

@openjdk openjdk bot added the ready label Dec 1, 2020
Copy link
Member

@chhagedorn chhagedorn left a comment

Looks good.

Loading

@phedlin
Copy link
Member Author

@phedlin phedlin commented Dec 1, 2020

Thanks for reviewing Aleksey and Christian.

/integrate

Loading

@openjdk openjdk bot closed this Dec 1, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 1, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 1, 2020

@phedlin Since your change was applied there have been 30 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit e3d0f27.

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

Loading

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