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

8253447: Remove buggy code introduced by 8249451 #292

Closed
wants to merge 2 commits into from
Closed

8253447: Remove buggy code introduced by 8249451 #292

wants to merge 2 commits into from

Conversation

jamsheedcm
Copy link
Member

@jamsheedcm jamsheedcm commented Sep 22, 2020

if ((thread->has_pending_exception() || thread->frames_to_pop_failed_realloc() > 0) && exec_mode != Unpack_uncommon_trap) {
assert(thread->has_pending_exception(), "should have thrown OOME/Async");

introduced a buggy code checking, clearing pending exception and taking Unpack_exception route.

This can have consequences as the deopt entries may have additional logic depending on bci's. and the change introduced in 8249451 doesn't honor deopt exception checking and forward logic.
Thank you @fisk for pointing the bug in the code.
Request for review.

/cc hotspot-compiler
/cc hotspot-runtime


Progress

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

Issue

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 22, 2020

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

@jamsheedcm jamsheedcm changed the title fixing buggy code introduced in 8249451 8253447: fixing buggy code introduced in 8249451 Sep 22, 2020
@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Sep 22, 2020
@openjdk
Copy link

openjdk bot commented Sep 22, 2020

@jamsheedcm
The hotspot-compiler label was successfully added.

@openjdk openjdk bot added rfr Pull request is ready for review hotspot-runtime hotspot-runtime-dev@openjdk.org labels Sep 22, 2020
@openjdk
Copy link

openjdk bot commented Sep 22, 2020

@jamsheedcm
The hotspot-runtime label was successfully added.

@openjdk
Copy link

openjdk bot commented Sep 22, 2020

@jamsheedcm The following label will be automatically applied to this pull request: hotspot.

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 (add|remove) "label" command.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Sep 22, 2020
@jamsheedcm jamsheedcm changed the title 8253447: fixing buggy code introduced in 8249451 8253447: Remove buggy code introduced by 8249451 Sep 22, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 22, 2020

Webrevs

@jamsheedcm
Copy link
Member Author

@dholmes-ora @veresov @fisk could you please have a look.

@openjdk
Copy link

openjdk bot commented Sep 22, 2020

@jamsheedcm This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8253447: Remove buggy code introduced by 8249451

Reviewed-by: iveresov, eosterlund
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch:

  • 282b9dc: 8081833: Clean up JVMFlag getter/setter code
  • 0e98fc1: 8253237: [REDO] Improve large object handling during evacuation

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 282b9dcfdc0adc8596abc4e758756e84d337b2f7.

➡️ 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 Sep 22, 2020
Copy link
Contributor

@fisk fisk 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, thanks for fixing this.

@jamsheedcm
Copy link
Member Author

Thank you @dholmes-ora @veresov @fisk

/integrate

@openjdk openjdk bot closed this Sep 22, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 22, 2020
@openjdk
Copy link

openjdk bot commented Sep 22, 2020

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

  • 282b9dc: 8081833: Clean up JVMFlag getter/setter code
  • 0e98fc1: 8253237: [REDO] Improve large object handling during evacuation

Your commit was automatically rebased without conflicts.

Pushed as commit f7b1ce4.

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

@jamsheedcm jamsheedcm deleted the JDK-8253447 branch September 22, 2020 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
4 participants