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

8318180: Memory model reference from foreign package-info is broken #16204

Closed
wants to merge 1 commit into from

Conversation

mcimadamore
Copy link
Contributor

@mcimadamore mcimadamore commented Oct 16, 2023

This PR fixes a wrong reference to the JLS memory model section.


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-8318180: Memory model reference from foreign package-info is broken (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16204

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 16, 2023

👋 Welcome back mcimadamore! 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 Oct 16, 2023
@openjdk
Copy link

openjdk bot commented Oct 16, 2023

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Oct 16, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 16, 2023

Webrevs

@mcimadamore
Copy link
Contributor Author

mcimadamore commented Oct 16, 2023

The broken reference seems to have originated from a bogus edit to a section that used to be present:

* @apiNote The normal Java Object access control, guarantees and constraints, for example stated in
 * {@jls 6.6} and {@jls 10.4}, do not apply when accessing native memory segments as these segments are
 * backed by off-heap regions of memory.

Accidentally, normal Java Object access control, guarantees and constraints, was replaced to reference memory model (following a CSR comment). But the old JLS reference stayed, leading to this issue.

We could, if desired, also keep the old references (and text!) too - but IMHO it is a bit confusing to be talking about access control when mentioning access to off-heap memory, so maybe it would be better to leave those out?

@openjdk
Copy link

openjdk bot commented Oct 16, 2023

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

8318180: Memory model reference from foreign package-info is broken

Reviewed-by: jvernee

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

  • aed1e81: 8317285: Misspellings in hprof test lib
  • 741ae06: 8313613: Use JUnit in langtools/lib tests
  • 8c1bb2b: 8268916: Tests for AffirmTrust roots
  • 2d38495: 8316309: AArch64: VMError::print_native_stack() crashes on Java native method frame
  • 0d09168: 8312527: (ch) Re-examine use of sun.nio.ch.Invoker.myGroupAndInvokeCount
  • 1a7fd5d: 8317687: (fs) FileStore.supportsFileAttributeView("posix") incorrectly returns 'true' for FAT32 volume on macOS
  • eb7d972: 8308659: Use CSS scroll-margin instead of flexbox layout in API documentation
  • 7028fb9: 8317975: [JVMCI] assert(pointee != nullptr) failed: invariant
  • 36993ae: 8316918: Optimize conversions duplicated across phi nodes
  • 668d4b0: 8318154: Improve stability of WheelModifier.java test
  • ... and 13 more: https://git.openjdk.org/jdk/compare/7cb2e6d65b517b638a584149560a2ff9cc56c3b6...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 Oct 16, 2023
@JornVernee
Copy link
Member

We could, if desired, also keep the old references (and text!) too - but IMHO it is a bit confusing to be talking about access control when mentioning access to off-heap memory, so maybe it would be better to leave those out?

I don't see how a reference to access control would be useful here. Leave it out, IMO.

@mcimadamore
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 17, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 17, 2023

@mcimadamore Pushed as commit b2b8db6.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants