Skip to content

Conversation

@minborg
Copy link
Contributor

@minborg minborg commented Nov 27, 2024

This PR proposes to check for empty layouts in the fallback linker and then prevent them from being forwarded.

Passes tier5 linker tests.


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-8344989: Test java/foreign/TestLinker.java failed with zero: IllegalStateException: libffi call failed with status: FFI_BAD_TYPEDEF (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22417

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 27, 2024

👋 Welcome back pminborg! 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 Nov 27, 2024

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

8344989: Test java/foreign/TestLinker.java failed with zero: IllegalStateException: libffi call failed with status: FFI_BAD_TYPEDEF

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

  • edfe285: 8344306: RISC-V: Add zicond
  • d33ad07: 8334493: Remove SecurityManager Permissions infrastructure from DiagnosticCommands
  • 56f1e4e: 8344093: Implement JEP 501: Deprecate the 32-bit x86 Port for Removal
  • d791f4b: 8341585: Test java/foreign/TestUpcallStress.java should mark as /native
  • e096660: 8345043: [ASAN] methodMatcher.cpp report reading from a region of size 0 [-Werror=stringop-overread]
  • 1033385: 8344967: Some tests in TestFill do not use the test parameter
  • 81c44e5: 8344908: URLClassPath should not propagate IllegalArgumentException when finding resources in classpath URLs
  • ce9d543: 8345119: Some java/foreign tests wrongly assume aligned memory
  • 1a07d54: 8343703: Symbol name cleanups after JEP 479
  • a0df0a5: 8340731: Cleanup remaining IA64 references in hotspot code
  • ... and 15 more: https://git.openjdk.org/jdk/compare/ac3bbf7ddc1f6a55682264d66282e6ee8825f47a...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
Copy link

openjdk bot commented Nov 27, 2024

@minborg 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.

@minborg minborg marked this pull request as ready for review November 28, 2024 07:04
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 28, 2024
@mlbridge
Copy link

mlbridge bot commented Nov 28, 2024

Webrevs

var struct8a8 = MemoryLayout.structLayout(sequence0a8, sequence3a1, padding5a1);
var fd = FunctionDescriptor.of(struct8a8, struct8a8, struct8a8);
linker.downcallHandle(fd);
if (linker.getClass().equals(FallbackLinker.class)) {
Copy link
Member

Choose a reason for hiding this comment

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

Alternatively, we could move this test case to a separate file (perhaps with other test cases that test empty aggregates), and then exclude it for the fallback linker using @requires jdk.foreign.linker != "FALLBACK".

I don't mind this approach though.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 28, 2024
@minborg
Copy link
Contributor Author

minborg commented Nov 29, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Nov 29, 2024

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

  • 08d563b: 8345110: RISC-V: Optimize and and clean up byte reverse assembler routines
  • 959fa4a: 8344299: SM cleanup in javax.naming modules
  • 43000a3: 8345075: java.lang.module.ModuleDescriptor constructor could be made private
  • fd742af: 8344394: Remove SecurityManager and related calls from java.management.rmi
  • 3b21a29: 8345175: Further cleanup in java.logging and jdk.internal.logger after JEP 486 integration
  • 7dc00d3: 8345154: IGV: Show Parse and Assertion Predicate type as extra label
  • 1e086b1: 8340103: Add internal set_flag function to VMATree
  • db535c8: 8313367: SunMSCAPI cannot read Local Computer certs w/o Windows elevation
  • edfe285: 8344306: RISC-V: Add zicond
  • d33ad07: 8334493: Remove SecurityManager Permissions infrastructure from DiagnosticCommands
  • ... and 23 more: https://git.openjdk.org/jdk/compare/ac3bbf7ddc1f6a55682264d66282e6ee8825f47a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 29, 2024

@minborg Pushed as commit f2c0d18.

💡 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 [email protected] integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants