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

8262998: Vector API intrinsincs should not modify IR when bailing out #2823

Closed
wants to merge 1 commit into from

Conversation

@DamonFool
Copy link
Member

@DamonFool DamonFool commented Mar 4, 2021

Hi all,

While I was learning [1], I found similar bugs in Vector API.
The reason is the same that make_unsafe_address [2][3] may modify IR when bailing out.
Let's fix it.

Thanks.
Best regards,
Jie

[1] #2775
[2] https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/vectorIntrinsics.cpp#L782
[3] https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/vectorIntrinsics.cpp#L612


Progress

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

Issue

  • JDK-8262998: Vector API intrinsincs should not modify IR when bailing out

Reviewers

Download

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

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Mar 4, 2021

/issue add JDK-8262998
/test
/label add hotspot-compiler
/cc hotspot-compiler

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 4, 2021

👋 Welcome back jiefu! 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 Mar 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 4, 2021

@DamonFool This issue is referenced in the PR title - it will now be updated.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 4, 2021

@DamonFool
The hotspot-compiler label was successfully added.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 4, 2021

@DamonFool The hotspot-compiler label was already applied.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 4, 2021

Webrevs

Loading

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Good catch. Looks good to me.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 4, 2021

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

8262998: Vector API intrinsincs should not modify IR when bailing out

Reviewed-by: thartmann, vlivanov

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

  • 2251319: 8262828: Format of OS information is different on macOS
  • 4cfecce: 8261730: C2 compilation fails with assert(store->find_edge(load) != -1) failed: missing precedence edge
  • 7915a1f: 8262950: Restructure compiler/intrinsics/TestRotate.java for easier compilation

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 Mar 4, 2021
@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Mar 4, 2021

Good catch. Looks good to me.

Thanks @TobiHartmann for your review.

Loading

Copy link

@iwanowww iwanowww left a comment

Looks good.

Loading

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Mar 4, 2021

Looks good.

Thanks @iwanowww .

Loading

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Mar 5, 2021

/integrate

Loading

@openjdk openjdk bot closed this Mar 5, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 5, 2021

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

  • 80182f9: 8260925: HttpsURLConnection does not work with other JSSE provider.
  • dbef0ec: 6323374: (coll) Optimize Collections.unmodifiable* and synchronized*
  • ee09bad: 8262300: jpackage app-launcher fails on linux when using JDK11 based runtime
  • 351889f: 8262508: Vector API's ergonomics is incorrect
  • 718d4d4: 8262989: Vectorize VectorShuffle checkIndexes, wrapIndexes and laneIsValid methods
  • c8b23e2: 8262064: Make compiler/ciReplay tests ignore lambdas in compilation replay
  • 02fbcb5: 8261532: Archived superinterface class cannot be accessed
  • 109af7b: 8261518: jpackage looks for main module in current dir when there is no module-path
  • e61a3ba: 8239386: handle ContendedPaddingWidth in vm_version_aarch64
  • f56c918: 8262837: handle split_USE correctly
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/84c93d5a18021c178d2f28b22869e910c391ead2...master

Your commit was automatically rebased without conflicts.

Pushed as commit d91550e.

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

Loading

@DamonFool DamonFool deleted the JDK-8262998 branch Mar 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants