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

8311508: ZGC: RAII use of IntelJccErratumAlignment #15191

Closed
wants to merge 1 commit into from

Conversation

xmas92
Copy link
Member

@xmas92 xmas92 commented Aug 8, 2023

Fixed the locations where unnamed IntelJccErratumAlignment circumvented the correctness asserts.
Also strengthened the asserts so that a IntelJccErratumAlignment RAII object scope must surround at least some instruction.

Tested GHA and tier1,tier2


Progress

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

Issue

  • JDK-8311508: ZGC: RAII use of IntelJccErratumAlignment (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15191/head:pull/15191
$ git checkout pull/15191

Update a local copy of the PR:
$ git checkout pull/15191
$ git pull https://git.openjdk.org/jdk.git pull/15191/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15191

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15191.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 8, 2023

👋 Welcome back aboldtch! 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 Aug 8, 2023
@openjdk
Copy link

openjdk bot commented Aug 8, 2023

@xmas92 The following label will be automatically applied to this pull request:

  • hotspot

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 hotspot-dev@openjdk.org label Aug 8, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 8, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 8, 2023

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

8311508: ZGC: RAII use of IntelJccErratumAlignment

Reviewed-by: stefank, shade, tschatzl

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

  • 52ec4bc: 8303056: Improve support for Unicode characters and digits in JavaDoc search
  • 9cf12bb: 8313922: Remove unused WorkerPolicy::_debug_perturbation
  • 6e3cc13: 8312467: relax the builddir check in make/autoconf/basic.m4
  • 77e5739: 8310118: Resource files should be moved to appropriate directories
  • 96304f3: 8313691: use close after failing os::fdopen in vmError and ciEnv
  • 3fb4805: 8307462: [REDO] VmObjectAlloc is not generated by intrinsics methods which allocate objects
  • 0a42c44: 8313954: Add gc logging to vmTestbase/vm/gc/containers/Combination05
  • 735b16a: 8313752: InstanceKlassFlags::print_on doesn't print the flag names
  • d3b578f: 8313345: SuperWord fails due to CMove without matching Bool pack
  • 31a307f: 8306441: Two phase segmented heap dump
  • ... and 11 more: https://git.openjdk.org/jdk/compare/87b08b6e0192d88025c2275c7dd2c4bdecda58e8...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 Aug 8, 2023
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine. There is no functional change, only the assert that verifies the destructor actually runs after the "protected" instructions emitted.

@xmas92
Copy link
Member Author

xmas92 commented Aug 10, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Aug 10, 2023

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

  • 242a2e6: 8308843: Generational ZGC: Remove gc/z/TestHighUsage.java
  • c822183: 8313768: Reduce interaction with volatile field in j.u.l.StreamHandler
  • cd16158: 8314075: Update JCov version for JDK 22
  • c307391: 8307184: Incorrect/inconsistent specification and implementation for Elements.getDocComment
  • 593ba2f: 8313693: Introduce an internal utility for the Damerau–Levenshtein distance calculation
  • 360f65d: 8314022: Problem-list tests failing with jtreg 7.3
  • 0eb0997: 8288936: Wrong lock ordering writing G1HeapRegionTypeChange JFR event
  • 19ae62a: 8311170: Simplify and modernize equals and hashCode in security area
  • e9f751a: 8311247: Some cpp files are compiled with -std:c11 flag
  • 213d3c4: 8313891: JFR: Incorrect exception message for RecordedObject::getInt
  • ... and 22 more: https://git.openjdk.org/jdk/compare/87b08b6e0192d88025c2275c7dd2c4bdecda58e8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 10, 2023
@openjdk openjdk bot closed this Aug 10, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 10, 2023
@openjdk
Copy link

openjdk bot commented Aug 10, 2023

@xmas92 Pushed as commit e080a0b.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants