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

8276136: functional interface extraction broken after API refresh #605

Conversation

mcimadamore
Copy link
Collaborator

@mcimadamore mcimadamore commented Oct 28, 2021

This addresses the issue discovered in this thread:

https://mail.openjdk.java.net/pipermail/panama-dev/2021-September/015144.html

The issue is causes by the fact that the new linker changes introduce an asymmetry between the method type of the downcall and that of an upcall. Downcall have Addressable for parameters passed by-reference, and MemoryAddress for by-reference returns. Upcalls adopt the dual scheme (MemoryAddress for parameters, Addressable for return values).

This patch bridges the two schemes by inserting the required casts which keep invokeExact happy in the case where we generate a functional interface implementation which calls the upcall stub address.

To do that I had to dig a bit in TypeTranslator to make the type translation context-dependent. I also had to enhance FunctionInfo so that it could carry the "reverse" method type in the upcall case.

I've added a test which checks a function pointer which takes an address and returns another address - which stresses both argument and return mismatch.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • JDK-8276136: functional interface extraction broken after API refresh

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/panama-foreign pull/605/head:pull/605
$ git checkout pull/605

Update a local copy of the PR:
$ git checkout pull/605
$ git pull https://git.openjdk.java.net/panama-foreign pull/605/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 605

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/panama-foreign/pull/605.diff

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 28, 2021

👋 Welcome back mcimadamore! A progress list of the required criteria for merging this PR into foreign-jextract 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 Ready for review label Oct 28, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 28, 2021

Webrevs

Copy link
Member

@JornVernee JornVernee 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 Oct 29, 2021

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

8276136: functional interface extraction broken after API refresh

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 122 new commits pushed to the foreign-jextract 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 foreign-jextract branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Oct 29, 2021
@mcimadamore
Copy link
Collaborator Author

mcimadamore commented Oct 29, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 29, 2021

Going to push as commit ac0b4a1.
Since your change was applied there have been 207 commits pushed to the foreign-jextract branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 29, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Oct 29, 2021
@openjdk
Copy link

openjdk bot commented Oct 29, 2021

@mcimadamore Pushed as commit ac0b4a1.

💡 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
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

2 participants