Skip to content

8362169: Pointer passed to upcall may get wrong scope #26295

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

Closed
wants to merge 3 commits into from

Conversation

JornVernee
Copy link
Member

@JornVernee JornVernee commented Jul 14, 2025

Issue copied from the JBS issue:

When an upcall stub accepts a by-value struct, and the struct is passed by the underlying ABI as a pointer to a temporary copy on the caller's stack (for instance on Windows when the struct doesn't fit into a single register), a scope is created for the duration of the upcall, to which the memory segment for this struct is attached.

However, if such a scope is created for the upcall, any other unrelated pointer argument will also be attached to the same scope. This is incorrect, as unrelated pointer arguments should be attached to the global scope. The underlying issue is that, when deciding whether a particular argument needs to be attached to the scope, we check if any of the argument needs to be attached to the created scope.

This PR fixes the issue by calling boxAddress.needsScope() in BindingSpecializer::emitBoxAddress, which checks only if that particular argument needs to be attached to the upcall scope.

I've also renamed the 'global' needsScope method, which checks whether any of the arguments need a scope, to anyArgNeedsScope for clarity.

Testing: jdk_foreign test suite on Mac/Windows/Linux x64, and Mac/Linux aarch64


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-8362169: Pointer passed to upcall may get wrong scope (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26295

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 14, 2025

👋 Welcome back jvernee! 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
Copy link

openjdk bot commented Jul 14, 2025

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

8362169: Pointer passed to upcall may get wrong scope

Reviewed-by: mcimadamore

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

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
Copy link

openjdk bot commented Jul 14, 2025

@JornVernee 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 Jul 14, 2025
@JornVernee JornVernee marked this pull request as ready for review July 14, 2025 16:27
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 14, 2025
@mlbridge
Copy link

mlbridge bot commented Jul 14, 2025

Webrevs

Copy link
Contributor

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 16, 2025
@JornVernee
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 18, 2025

Going to push as commit 9dc6282.
Since your change was applied there have been 76 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 Jul 18, 2025
@openjdk openjdk bot closed this Jul 18, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 18, 2025
@openjdk
Copy link

openjdk bot commented Jul 18, 2025

@JornVernee Pushed as commit 9dc6282.

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

@JornVernee JornVernee deleted the UpcallPtrScope branch July 18, 2025 14:54
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