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

8266627: CLinker allocateMemory, freeMemory implementation should not use default lookup #527

Conversation

@mcimadamore
Copy link
Collaborator

@mcimadamore mcimadamore commented May 6, 2021

This patch removes the workaround on Windows which requires loading msvcrt.dll.

The solution is to create (Java side) a memory segment and fill it with function pointers on the VM side.
This way, Java code can look up VM functions easily. I've moved this support onto a different class, as the approach might, in the future, be required for other VM functions.


Progress

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

Issue

  • JDK-8266627: CLinker allocateMemory, freeMemory implementation should not use default lookup

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 527

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 6, 2021

👋 Welcome back mcimadamore! A progress list of the required criteria for merging this PR into foreign-memaccess+abi 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 May 6, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 6, 2021

Webrevs

Copy link
Member

@JornVernee JornVernee left a comment

LGTM. works-on-my-machine as well

*/

#include <stdlib.h>
#include <assert.h>
Copy link
Member

@JornVernee JornVernee May 6, 2021

Choose a reason for hiding this comment

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

Curious; why is this assert.h include needed? (usually assert.h conflicts with hotspot's own assert)

Copy link
Collaborator Author

@mcimadamore mcimadamore May 6, 2021

Choose a reason for hiding this comment

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

No reason, I realized that I had it at some point but then cleaned up code... it's a leftover

@openjdk
Copy link

@openjdk openjdk bot commented May 6, 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:

8266627: CLinker allocateMemory, freeMemory implementation should not use default lookup

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 no new commits pushed to the foreign-memaccess+abi branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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-memaccess+abi branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label May 6, 2021
@mcimadamore
Copy link
Collaborator Author

@mcimadamore mcimadamore commented May 6, 2021

/integrate

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

@openjdk openjdk bot commented May 6, 2021

@mcimadamore Pushed as commit d0a7098.

💡 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
2 participants