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

8273486: Zero: Handle DiagnoseSyncOnValueBasedClasses VM option #209

Closed
wants to merge 2 commits into from

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Oct 20, 2021

Unclean backport to fix Zero. The uncleanliness comes from the existing test shape in 17u, which uses UseOptoBiasInlining that is C2-specific flag, which Zero has no access to. In JDK 18, this was removed along with biased locking deprecation. I opted to fix the test in-place.

Additional testing:

  • Linux x86_64 Zero passes the test now
  • Linux x86_64 Server continues to pass the test

Progress

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

Issue

  • JDK-8273486: Zero: Handle DiagnoseSyncOnValueBasedClasses VM option ⚠️ Issue is not open.

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 209

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 20, 2021

👋 Welcome back shade! 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 label Oct 20, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 20, 2021

Webrevs

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Nov 15, 2021

Any takers? :)

Copy link
Member

@phohensee phohensee left a comment

Lgtm.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 15, 2021

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

8273486: Zero: Handle DiagnoseSyncOnValueBasedClasses VM option

Reviewed-by: phh

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

  • c3de885: 8273416: C2: assert(false) failed: bad AD file after JDK-8252372 with UseSSE={0,1}
  • ff4f533: 8274560: JFR: Add test for OldObjectSample event when using Shenandoah
  • 23b4496: 8268927: Windows: link error: unresolved external symbol "int __cdecl convert_to_unicode(char const *,wchar_t * *)"
  • a1036ef: 8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
  • 193c7f1: 8274501: c2i entry barriers read int as long on AArch64
  • 3e349b4: 8276025: Hotspot's libsvml.so may conflict with user dependency
  • 58a6dae: 8275872: Sync J2DBench run and analyze Makefile targets with build.xml
  • 7aaad16: 8238649: Call new Win32 API SetThreadDescription in os::set_native_thread_name
  • 16a191c: 8261579: AArch64: Support for weaker memory ordering in Atomic
  • 89a03fe: 8273450: Fix the copyright header of SVML files
  • ... and 127 more: https://git.openjdk.java.net/jdk17u/compare/393547b2a25de27c3d1c38344c1645925c743153...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 label Nov 15, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Nov 16, 2021

Thanks!

Got the push approval too.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 16, 2021

Going to push as commit 1d11bcd.
Since your change was applied there have been 146 commits pushed to the master branch:

  • 95726bf: 8276105: C2: Conv(D|F)2(I|L)Nodes::Ideal should handle rounding correctly
  • 93d8337: 8276846: JDK-8273416 is incomplete for UseSSE=1
  • 6f3cd6b: 8267385: Create NSAccessibilityElement implementation for JavaComponentAccessibility
  • 7758191: 8274521: jdk/jfr/event/gc/detailed/TestGCLockerEvent.java fails when other GC is selected
  • cc09778: 8268860: Windows-Aarch64 build is failing in GitHub actions
  • e4425d8: 8276157: C2: Compiler stack overflow during escape analysis on Linux x86_32
  • 6221d61: 8276112: Inconsistent scalar replacement debug info at safepoints
  • 24c7fe3: 8268294: Reusing HttpClient in a WebSocket.Listener hangs.
  • b2f4dff: 8269481: SctpMultiChannel never releases own file descriptor
  • c3de885: 8273416: C2: assert(false) failed: bad AD file after JDK-8252372 with UseSSE={0,1}
  • ... and 136 more: https://git.openjdk.java.net/jdk17u/compare/393547b2a25de27c3d1c38344c1645925c743153...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 16, 2021

@shipilev Pushed as commit 1d11bcd.

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

@shipilev shipilev deleted the JDK-8273486 branch Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated
2 participants