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

8313616: support loading library members on AIX in os::dll_load #308

Closed
wants to merge 2 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Oct 31, 2023

os_aix.cpp diff in stride


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8313616 needs maintainer approval

Issue

  • JDK-8313616: support loading library members on AIX in os::dll_load (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 308

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/308.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 31, 2023

👋 Welcome back mbaesken! 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 openjdk bot changed the title Backport 23fe2ece586d3ed750e905e1b71a2cd1da91f335 8313616: support loading library members on AIX in os::dll_load Oct 31, 2023
@openjdk
Copy link

openjdk bot commented Oct 31, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 31, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 31, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

The deletion of the header comment on os::dll_load is missing from the backport.

@openjdk openjdk bot added approval and removed approval labels Nov 16, 2023
@MBaesken
Copy link
Member Author

The deletion of the header comment on os::dll_load is missing from the backport.

sorry maybe I miss something ?

openjdk/jdk@23fe2ec

changes only cpp files, no header .
And the comment from os_aix.cpp is present ?

@phohensee
Copy link
Member

Sorry for being unclear. I meant the comment ahead of the definition of os:dll_load at lines 1104-1105 in os_aix.cpp is deleted by the original commit.

// Loads .dll/.so and in case of error it checks if .dll/.so was built
// for the same architecture as Hotspot is running on.

They're still in the backport version at lines 1101-1102.

@MBaesken
Copy link
Member Author

Thanks Paul, I removed the comment lines.

@openjdk openjdk bot added the clean label Nov 22, 2023
@openjdk
Copy link

openjdk bot commented Nov 22, 2023

⚠️ @MBaesken This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk
Copy link

openjdk bot commented Nov 22, 2023

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

8313616: support loading library members on AIX in os::dll_load

Reviewed-by: phh

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

  • 220b36c: 8310239: Add missing cross modifying fence in nmethod entry barriers
  • d7a3ac7: 8318587: refresh libraries cache on AIX in print_vm_info
  • 0941f2c: 8318562: Computational test more than 2x slower when AVX instructions are used
  • e7bd0ab: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
  • 21a003a: 8320209: VectorMaskGen clobbers rflags on x86_64
  • 689b90d: 8318957: enhance agentlib:jdwp help output by info about allow option
  • cf187a1: 8318955: Add ReleaseIntArrayElements in Java_sun_awt_X11_XlibWrapper_SetBitmapShape XlbWrapper.c to early return
  • 73d59d0: 8318591: avoid leaks in loadlib_aix.cpp reload_table()
  • 53fec1b: 8318981: compiler/compilercontrol/TestConflictInlineCommands.java fails intermittent with 'disallowed by CompileCommand' missing from stdout/stderr
  • 177d994: 8306561: Possible out of bounds access in print_pointer_information
  • ... and 90 more: https://git.openjdk.org/jdk21u/compare/f4ed66ee82c2d01eb5cef213af8f3d8bf0242d6c...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 openjdk bot added the ready Pull request is ready to be integrated label Nov 22, 2023
@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

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

  • 220b36c: 8310239: Add missing cross modifying fence in nmethod entry barriers
  • d7a3ac7: 8318587: refresh libraries cache on AIX in print_vm_info
  • 0941f2c: 8318562: Computational test more than 2x slower when AVX instructions are used
  • e7bd0ab: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
  • 21a003a: 8320209: VectorMaskGen clobbers rflags on x86_64
  • 689b90d: 8318957: enhance agentlib:jdwp help output by info about allow option
  • cf187a1: 8318955: Add ReleaseIntArrayElements in Java_sun_awt_X11_XlibWrapper_SetBitmapShape XlbWrapper.c to early return
  • 73d59d0: 8318591: avoid leaks in loadlib_aix.cpp reload_table()
  • 53fec1b: 8318981: compiler/compilercontrol/TestConflictInlineCommands.java fails intermittent with 'disallowed by CompileCommand' missing from stdout/stderr
  • 177d994: 8306561: Possible out of bounds access in print_pointer_information
  • ... and 90 more: https://git.openjdk.org/jdk21u/compare/f4ed66ee82c2d01eb5cef213af8f3d8bf0242d6c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 24, 2023

@MBaesken Pushed as commit ecb199a.

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

@TheRealMDoerr
Copy link
Contributor

This backport introduced a bug in 21.0.2: JDK-8320830

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
3 participants