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

8286182: [BACKOUT] x86: Handle integral division overflow during parsing #8774

Closed
wants to merge 3 commits into from

Conversation

merykitty
Copy link
Member

@merykitty merykitty commented May 18, 2022

This patch backs out the changes made by JDK-8285390 and JDK-8284742 since there are failures due to div nodes floating above their validity checks.

Thanks.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issues

  • JDK-8286182: [BACKOUT] x86: Handle integral division overflow during parsing
  • JDK-8287035: [BACKOUT] PPC64: Handle integral division overflow during parsing

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8774

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 18, 2022

👋 Welcome back merykitty! 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 the rfr Pull request is ready for review label May 18, 2022
@openjdk
Copy link

openjdk bot commented May 18, 2022

@merykitty The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels May 18, 2022
@mlbridge
Copy link

mlbridge bot commented May 18, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented May 18, 2022

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

8286182: [BACKOUT] x86: Handle integral division overflow during parsing
8287035: [BACKOUT] PPC64: Handle integral division overflow during parsing

Reviewed-by: mdoerr, 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 32 new commits pushed to the master branch:

  • fa1b56e: 8280696: C2 compilation hits assert(is_dominator(c, n_ctrl)) failed
  • af7cda5: 8285733: [s390] Vector Instruction Emitters for element-wise access are broken
  • d24c84e: 8286873: Improve websocket test execution time
  • db19dc6: 8284688: Minor cleanup could be done in java.security.jgss
  • 6e38666: 8286944: Loom: Common ContinuationEntry cookie handling
  • 47500b2: 8286897: Loom: Cleanup x86_64 StubGenerator
  • fc3edf2: 8285687: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/PageRangesDlgTest.java
  • 022e717: 8286462: Incorrect copyright year for src/java.base/share/classes/jdk/internal/vm/FillerObject.java
  • dbda0e2: 8286969: Add a new test library API to execute kinit in SecurityTools.java
  • 26c7c92: 8286694: Incorrect argument processing in java launcher
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/72bd41b844e03da4bcb19c2cb38d96975a9ebceb...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TheRealMDoerr, @TobiHartmann, @chhagedorn) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 18, 2022
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 good to me too but the backout should adhere to the process defined here: https://openjdk.java.net/guide/#backing-out-a-change

I would suggest "Alternative 2" of 3.

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Backout looks good except that you did not remove the test test/hotspot/jtreg/compiler/integerArithmetic/TestDivision.java which you've added here:
b4a85cd#diff-4daba70b215edefe9fd70b24f1e1052a51effdd48a1809e2ce5a06bc21a755c5

It's just a correctness test, so it would be okay to leave it in. But I guess it's better to backout everything.

@merykitty
Copy link
Member Author

/issue add 8287035

@merykitty merykitty changed the title 8286182: C2: crash with SIGFPE when executing compiled code 8286182: [BACKOUT] x86: Handle integral division overflow during parsing May 19, 2022
@openjdk
Copy link

openjdk bot commented May 19, 2022

@merykitty
Adding additional issue to issue list: 8287035: [BACKOUT] PPC64: Handle integral division overflow during parsing.

@merykitty
Copy link
Member Author

I have backed out also the division test and created JBS issues as instructed in the developer guide. Hope I have done it correctly. Thanks a lot for your reviews.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 19, 2022
@openjdk
Copy link

openjdk bot commented May 19, 2022

@merykitty
Your change (at version 1e2f12d) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented May 19, 2022

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

  • 7b19226: 8267038: Update IANA Language Subtag Registry to Version 2022-03-02
  • e60d8b5: 8253176: Signature.getParameters should specify that it can throw UnsupportedOperationException
  • aa50625: 8286447: [Linux] AWT should start in Headless mode if headful AWT library not installed
  • 655500a: 8286654: Add an optional description accessor on ToolProvider interface
  • ac6a7d7: 8278367: JNI critical region violation in CTextPipe.m:363
  • 83cec4b: 8284273: Early crashes in os::print_context on AArch64
  • fd36f37: 8286797: Guards of constant value false are not permitted
  • fa1b56e: 8280696: C2 compilation hits assert(is_dominator(c, n_ctrl)) failed
  • af7cda5: 8285733: [s390] Vector Instruction Emitters for element-wise access are broken
  • d24c84e: 8286873: Improve websocket test execution time
  • ... and 29 more: https://git.openjdk.java.net/jdk/compare/72bd41b844e03da4bcb19c2cb38d96975a9ebceb...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 19, 2022

@TheRealMDoerr @merykitty Pushed as commit 079312c.

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

@merykitty merykitty deleted the backout branch June 7, 2022 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants