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

8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem #282

Closed
wants to merge 1 commit into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Nov 17, 2021

Backport of JDK-8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem

Manually resolved the merge conflict of the following file:

  • src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u pull/282/head:pull/282
$ git checkout pull/282

Update a local copy of the PR:
$ git checkout pull/282
$ git pull https://git.openjdk.java.net/jdk17u pull/282/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 282

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u/pull/282.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 17, 2021

👋 Welcome back mchung! 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 309acbf0e86a0d248294503fccc7a936fa0a846e 8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem Nov 17, 2021
@openjdk
Copy link

openjdk bot commented Nov 17, 2021

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 Nov 17, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 17, 2021

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.

Lgtm.

@openjdk
Copy link

openjdk bot commented Nov 17, 2021

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

8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem

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

  • f1a8a22: 8276205: Shenandoah: CodeCache_lock should always be held for initializing code cache iteration
  • 95573d4: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc

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 Nov 17, 2021
@mlchung
Copy link
Member Author

mlchung commented Nov 19, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 19, 2021

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

  • 38db452: 8272170: Missing memory barrier when checking active state for regions
  • acecce5: 8276801: gc/stress/CriticalNativeStress.java fails intermittently with Shenandoah
  • 19201da: 8276905: Use appropriate macosx_version_minimum value while compiling metal shaders
  • 55f8d8c: 8271308: (fc) FileChannel.transferTo() transfers no more than Integer.MAX_VALUE bytes in one call
  • fdcc3f1: 8233020: (fs) UnixFileSystemProvider should use StaticProperty.userDir().
  • 0e896e7: 8277029: JMM GetDiagnosticXXXInfo APIs should verify output array sizes
  • 85f315b: 8272854: split runtime/CommandLine/PrintTouchedMethods.java test
  • 397bf95: 8275604: Zero: Reformat opclabels_data
  • 687dd87: 8276845: (fs) java/nio/file/spi/SetDefaultProvider.java fails on x86_32
  • e4cc0c1: 8276805: java/awt/print/PrinterJob/CheckPrivilege.java fails due to disabled SecurityManager
  • ... and 6 more: https://git.openjdk.java.net/jdk17u/compare/f9eed140be80840531ddb40a5d28e2142eaab506...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 19, 2021

@mlchung Pushed as commit 6aa02d7.

💡 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
backport integrated Pull request has been integrated
2 participants