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.

Sign up for GitHub

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

Jump to bottom

8263587: C2: JVMS not cloned when needs_clone_jvms() is true #3009

Closed
wants to merge 2 commits into from
Closed

8263587: C2: JVMS not cloned when needs_clone_jvms() is true #3009

wants to merge 2 commits into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Mar 15, 2021 •
edited by openjdk bot
Loading

We need a C2 fix to prevent crashes because JVMS doesn't get cloned as needed. See linked issue for details.

Progress

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

Issue

  • JDK-8263587: C2: JVMS not cloned when needs_clone_jvms() is true

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 15, 2021

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

openjdk bot commented Mar 15, 2021

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Mar 15, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 15, 2021 •
edited
Loading

Webrevs

GoeLin
GoeLin approved these changes Mar 15, 2021
View reviewed changes
Copy link
Member

@GoeLin GoeLin 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 Mar 15, 2021 •
edited
Loading

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

8263587: C2: JVMS not cloned when needs_clone_jvms() is true

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

  • 80cdf78: 8263544: Unused argument in ConstantPoolCacheEntry::set_field()
  • c0176c4: 8263552: Use String.valueOf() for char-to-String conversions
  • fac39fe: 8263508: Remove dead code in MethodHandleImpl
  • 7b4aefe: 8263530: sun.awt.X11.ListHelper.removeAll() should use clear()
  • 32c7fcc: 8263490: [macos] Crash occurs on JPasswordField with activated InputMethod
  • 8afec70: 8260931: Implement JEP 382: New macOS Rendering Pipeline
  • 0638303: 8263497: Clean up sun.security.krb5.PrincipalName::toByteArray
  • ba22e6f: 8263446: Avoid unary minus over unsigned type in ObjectSynchronizer::dec_in_use_list_ceiling
  • b371f90: 8263504: Some OutputMachOpcodes fields are uninitialized
  • f7e0a09: 8263425: AArch64: two potential bugs in C1 LIRGenerator::generate_address()
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/d339320e0b648e28bcc0c07801ae9376a33fc975...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.

➡️ 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 Mar 15, 2021
iwanowww
iwanowww approved these changes Mar 15, 2021
View reviewed changes
Copy link
Contributor

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

Cleanup idea: CallNode::clone_jvms() overrides differ only in the guarding condition. Extract node type dependent checks into a new helper method (CallNode::needs_clone_jvms()) and use it from now non-virtual CallNode::clone_jvms().

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the reviews and the cleanup proposal! Please take a look at my updated version.

iwanowww
iwanowww approved these changes Mar 15, 2021
View reviewed changes
Copy link
Contributor

@iwanowww iwanowww left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Even better! 👍

@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Mar 16, 2021
@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 Mar 16, 2021
@openjdk
Copy link

openjdk bot commented Mar 16, 2021

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

  • 68deb24: 8080272: Refactor I/O stream copying to use InputStream.transferTo/readAllBytes and Files.copy
  • a31a23d: 8263595: Remove oop type punning in JavaCallArguments
  • a1f6591: 8263589: Introduce JavaValue::get_oop/set_oop
  • 20297a1: 8263577: C2: reachable nodes shouldn't have dead uses at the end of optimizations
  • c484d89: 8263557: Possible NULL dereference in Arena::destruct_contents()
  • ba35193: 8263559: Add missing initializers to VM_PopulateDumpSharedSpace
  • e03a594: 8262504: Some CLHSDB command cannot know they run on remote debugger
  • d896246: 8263420: Incorrect function name in NSAccessibilityStaticText native peer implementation
  • 8c1112a: 8261916: gtest/GTestWrapper.java vmErrorTest.unimplemented1_vm_assert failed
  • 1e57087: 8263392: Allow current thread to be specified in ExceptionMark
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/d339320e0b648e28bcc0c07801ae9376a33fc975...master

Your commit was automatically rebased without conflicts.

Pushed as commit 9c50b8e.

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

@TheRealMDoerr TheRealMDoerr deleted the 8263587_C2_JVMS_cloning branch March 16, 2021 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GoeLin GoeLin GoeLin approved these changes

@iwanowww iwanowww iwanowww approved these changes

Assignees
No one assigned
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TheRealMDoerr @iwanowww @GoeLin