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

8326509: Clean up JNIEXPORT in Hotspot after JDK-8017234 #17967

Closed
wants to merge 13 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Feb 22, 2024

Once JDK-8017234 has been integrated, it is possible to do some cleanup. The goal of JDK-8017234 was to not change any behavior, even if that behavior seemed odd.

Now let's try to fix that. We can:

a) remove JNIEXPORT from c2v functions.
b) make debug.cpp functions exported similarly on all platforms.
c) remove JNIEXPORT from aarch64 asm debug function.

Note that this PR is dependent on #17955.


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-8326509: Clean up JNIEXPORT in Hotspot after JDK-8017234 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17967

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 22, 2024

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into pr/17955 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 Feb 22, 2024
@openjdk
Copy link

openjdk bot commented Feb 22, 2024

@magicus The following labels will be automatically applied to this pull request:

  • graal
  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Feb 22, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 22, 2024

Webrevs

@magicus
Copy link
Member Author

magicus commented Feb 22, 2024

/label +build

@openjdk openjdk bot added the build build-dev@openjdk.org label Feb 22, 2024
@openjdk
Copy link

openjdk bot commented Feb 22, 2024

@magicus
The build label was successfully added.

@dholmes-ora
Copy link
Member

With the one exception above I agree with these choices going forward. I don't think it matters that exporting for the debugger is not actually necessary on some platforms, and so code simplicity wins out for me. That said the litmus test will be whether hermetic Java encounters any conflicts.

Thanks

Copy link
Member

@djelinski djelinski left a comment

Choose a reason for hiding this comment

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

Nice cleanup!

src/hotspot/share/jvmci/vmStructs_jvmci.cpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Feb 23, 2024

@magicus Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/17955 to master February 27, 2024 10:29
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout hotspot-symbols-followup
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Feb 27, 2024

@magicus this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout hotspot-symbols-followup
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Feb 27, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Feb 27, 2024
@magicus
Copy link
Member Author

magicus commented Feb 27, 2024

There was a bit back and forth with this PR, but now I believe it is finally ready. Any reviewers?

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Seems fine to me. Thanks.

@openjdk
Copy link

openjdk bot commented Feb 28, 2024

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

8326509: Clean up JNIEXPORT in Hotspot after JDK-8017234

Reviewed-by: djelinski, jwaters, dholmes

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

  • 4dd6c44: 8326529: JFR: Test for CompilerCompile events fails due to time out
  • 33f2382: 8325807: Shenandoah: Refactor full gc in preparation for generational mode changes
  • 419191c: 8325680: Uninitialised memory in deleteGSSCB of GSSLibStub.c:179
  • 349df0a: 8326726: Problem list Exhaustiveness.java due to 8326616
  • 552411f: 8326824: Test: remove redundant test in compiler/vectorapi/reshape/utils/TestCastMethods.java
  • 9f0e7da: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • 81b065a: 8326714: Make file-local functions static in src/java.base/unix/native/libjava/childproc.c
  • 4fcae1a: 8326722: Cleanup unnecessary forward declaration in collectedHeap.hpp
  • c5c866a: 8326219: applications/kitchensink/Kitchensink8H.java timed out
  • ac3ce2a: 8326583: Remove over-generalized DefineNativeToolchain solution

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 openjdk bot added the ready Pull request is ready to be integrated label Feb 28, 2024
@magicus
Copy link
Member Author

magicus commented Feb 28, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Feb 28, 2024

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

  • 1ab6bd4: 8326135: Enhance adlc to report unused operands
  • 3b90ddf: 8326685: Linux builds not reproducible if two builds configured in different build folders
  • 9b1f1e5: 8326389: [test] improve assertEquals failure output
  • 6cad07c: 8325746: Refactor Loop Unswitching code
  • 4dd6c44: 8326529: JFR: Test for CompilerCompile events fails due to time out
  • 33f2382: 8325807: Shenandoah: Refactor full gc in preparation for generational mode changes
  • 419191c: 8325680: Uninitialised memory in deleteGSSCB of GSSLibStub.c:179
  • 349df0a: 8326726: Problem list Exhaustiveness.java due to 8326616
  • 552411f: 8326824: Test: remove redundant test in compiler/vectorapi/reshape/utils/TestCastMethods.java
  • 9f0e7da: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • ... and 4 more: https://git.openjdk.org/jdk/compare/bceaed6d4de391d1fdac0d35384c415a7c484d28...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 28, 2024

@magicus Pushed as commit e6b3bda.

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

@magicus magicus deleted the hotspot-symbols-followup branch February 28, 2024 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

10 participants