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

8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics #170

Closed
wants to merge 1 commit into from
Closed

8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics #170

wants to merge 1 commit into from

Conversation

@snazarkin
Copy link

@snazarkin snazarkin commented Apr 6, 2021

Hi! Please review the backport of JDK-8254790. The patch fixes SIGSEGV and is required for code sync with jdk11,15. The patch is taken from jdk15 since the original one can't be applied cleanly due to reasons described https://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/2020-October/040943.html


Progress

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

Issue

  • JDK-8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/170/head:pull/170
$ git checkout pull/170

Update a local copy of the PR:
$ git checkout pull/170
$ git pull https://git.openjdk.java.net/jdk13u-dev pull/170/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 170

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk13u-dev/pull/170.diff

@snazarkin snazarkin changed the title Backport afcf14912e9e37499444108e4b9c08d9bd6ef64f Backport 365f19c8e1833fb4b64d961b51ce9d586acf13ce Apr 6, 2021
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 6, 2021

👋 Welcome back snazarki! 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 changed the title Backport 365f19c8e1833fb4b64d961b51ce9d586acf13ce 8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics Apr 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

This backport pull request has now been updated with issue from the original commit.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 6, 2021

Webrevs

Copy link
Collaborator

@yan-too yan-too left a comment

Fine with me!

@openjdk
Copy link

@openjdk openjdk bot commented Apr 15, 2021

@snazarkin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics

Reviewed-by: yan

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

  • 8de0239: 8259585: [macos] Bad JNI lookup error : Accessible actions do not work on macOS
  • 2b18941: 8244853: The static build of libextnet is missing the JNI_OnLoad_extnet function
  • c32180e: 8259232: Bad JNI lookup during printing
  • 7daf680: 8241948: enhance list of environment variables printed in hs_err file
  • efc81a3: 8264640: CMS ParScanClosure misses a barrier
  • f1e4e0b: 8257988: Remove JNF dependency from libsaproc/MacosxDebuggerLocal.m
  • 2e9b3a0: 8260616: Removing remaining JNF dependencies in the java.desktop module
  • df2818b: 8259869: [macOS] Remove desktop module dependencies on JNF Reference APIs
  • 47ec3b8: 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
  • cdb993e: 8259343: [macOS] Update JNI error handling in Cocoa code.
  • ... and 4 more: https://git.openjdk.java.net/jdk13u-dev/compare/039003d37e9eb30cc1899f8dc38aeeb637068352...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 (@yan-too) 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 label Apr 15, 2021
@snazarkin
Copy link
Author

@snazarkin snazarkin commented Apr 16, 2021

/Integrate

@openjdk openjdk bot added the sponsor label Apr 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 16, 2021

@snazarkin
Your change (at version 7f9f5ae) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Collaborator

@yan-too yan-too commented Apr 16, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Apr 16, 2021

@yan-too @snazarkin Since your change was applied there have been 14 commits pushed to the master branch:

  • 8de0239: 8259585: [macos] Bad JNI lookup error : Accessible actions do not work on macOS
  • 2b18941: 8244853: The static build of libextnet is missing the JNI_OnLoad_extnet function
  • c32180e: 8259232: Bad JNI lookup during printing
  • 7daf680: 8241948: enhance list of environment variables printed in hs_err file
  • efc81a3: 8264640: CMS ParScanClosure misses a barrier
  • f1e4e0b: 8257988: Remove JNF dependency from libsaproc/MacosxDebuggerLocal.m
  • 2e9b3a0: 8260616: Removing remaining JNF dependencies in the java.desktop module
  • df2818b: 8259869: [macOS] Remove desktop module dependencies on JNF Reference APIs
  • 47ec3b8: 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
  • cdb993e: 8259343: [macOS] Update JNI error handling in Cocoa code.
  • ... and 4 more: https://git.openjdk.java.net/jdk13u-dev/compare/039003d37e9eb30cc1899f8dc38aeeb637068352...master

Your commit was automatically rebased without conflicts.

Pushed as commit 8a7c9d7.

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

@snazarkin snazarkin deleted the snazarkin:backport-8254790 branch Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants