8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m #21789

jaikiran · 2024-10-30T14:27:03Z

Can I please get a review of this change which cleans up a leftover code from the launcher's java_md_macosx.m file?

In https://bugs.openjdk.org/browse/JDK-8329862 changes were done in the launcher code to remove checks for <apphome>/jre/lib/ when determining the JDK installation root. Those changes were done in the Unix and Windows files and the macosx one got left out, likely due to an oversight.

The commit in this PR removes that leftover code. No new tests have been added and existing tier1, tier2, tier3 tests continue to pass.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (2 reviews required, with at least 2 Reviewers)

Issue

JDK-8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m (Bug - P4)

Reviewers

Brian Burkhalter (@bplb - Reviewer)
Roger Riggs (@RogerRiggs - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21789

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…e launcher's java_md_macosx.m

bridgekeeper · 2024-10-30T14:28:06Z

👋 Welcome back jpai! 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 · 2024-10-30T14:28:11Z

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

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m

Reviewed-by: bpb, rriggs

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

d3c042f: 8343770: Build fails due to use of sun.misc.Unsafe in LoopOverRandom
1d117f6: 8343394: Make MemorySessionImpl.state a stable field
d2b681d: 8343730: JMX cleanups
ac82a8f: 8343610: InOutPathTest jpackage test produces invalid app image on macOS
f0b251d: 8343531: Improve print_location for invalid heap pointers
4244682: 8339190: Parameter arrays that are capped during annotation processing report incorrect length
7620b12: 8323803: ConstantOopReadValue::print_on should print 'null' instead of 'nullptr'
592a48b: 8321997: Increase upper limit of LoopOptsCount flag
c3df050: 8343726: [BACKOUT] NMT should not use ThreadCritical
0e1c1b7: 8343452: Incorrect WINDOWS build variable is used in macroAssembler_x86.cpp
... and 117 more: https://git.openjdk.org/jdk/compare/821c514a132e809a14648ddbb56f2ffee85fd35a...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 · 2024-10-30T14:28:51Z

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

mlbridge · 2024-10-30T14:31:20Z

Webrevs

01: Full - Incremental (e09dd1b3)
00: Full (e125c18e)

bplb · 2024-10-31T01:51:54Z

/reviewers 2 reviewer

openjdk · 2024-10-31T01:52:25Z

@bplb
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 2 Reviewers).

bplb

Looks fine to me, especially given the testing cited, but this is not my area so I bumped the reviewer count to 2.

RogerRiggs · 2024-11-01T14:36:39Z

src/java.base/macosx/native/libjli/java_md_macosx.m

@@ -429,18 +429,6 @@ static void MacOSXStartup(int argc, char *argv[]) {
                return JNI_TRUE;
            }
        }
-        /* ensure storage for path + /jre + NULL */


The corresponding changes in JDK-8329862 included adding a call to JLI_TraceLauncher.
Such as:
JLI_TraceLauncher("Attempt to get JDK installation root from launcher executable path\n");
Adding a similar trace message would be consistent across platforms.

That's a good point. I've now updated the PR to add the same log message as the one present in unix/windows variant of this code.

RogerRiggs

Thanks fro the extra logging.

bplb

Looks fine.

jaikiran · 2024-11-08T04:04:03Z

Thank you Roger and Brian for the reviews.

jaikiran · 2024-11-08T04:04:10Z

/integrate

openjdk · 2024-11-08T04:04:38Z

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

f621f26: 8343724: [PPC64] Disallow OptoScheduling
a63f501: 8343396: Use OperatingSystem, Architecture, and OSVersion in jpackage tests
84c99fb: 8283664: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/PrintTextTest.java
2c7bea1: 8343772: Expected IAPE not thrown in KDF.getInstance (TCK)
fac89f4: 8343493: Perform module checks during MetaspaceShared::map_archives()
ccda815: 8342303: Segfault in update_inherited_vtable: AppCDS, old bytecode, and redefineClasses
4f5a241: 8343491: javax/management/remote/mandatory/connection/DeadLockTest.java failing with NoSuchObjectException: no such object in table
56c588b: 8343417: (fs) BasicFileAttributeView.setTimes uses microsecond precision with NOFOLLOW_LINKS
d3c042f: 8343770: Build fails due to use of sun.misc.Unsafe in LoopOverRandom
1d117f6: 8343394: Make MemorySessionImpl.state a stable field
... and 125 more: https://git.openjdk.org/jdk/compare/821c514a132e809a14648ddbb56f2ffee85fd35a...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-08T04:04:46Z

@jaikiran Pushed as commit 068f4ce.

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

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from th…

e125c18

…e launcher's java_md_macosx.m

openjdk bot added the rfr Pull request is ready for review label Oct 30, 2024

openjdk bot added the core-libs core-libs-dev@openjdk.org label Oct 30, 2024

bplb approved these changes Oct 31, 2024

View reviewed changes

RogerRiggs reviewed Nov 1, 2024

View reviewed changes

Roger's suggestion - introduce log message to match unix/windows

e09dd1b

RogerRiggs approved these changes Nov 7, 2024

View reviewed changes

bplb approved these changes Nov 7, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 7, 2024

openjdk bot added the integrated Pull request has been integrated label Nov 8, 2024

openjdk bot closed this Nov 8, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 8, 2024

jaikiran deleted the 8343293 branch November 8, 2024 04:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m #21789

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m #21789

jaikiran commented Oct 30, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Oct 30, 2024

openjdk bot commented Oct 30, 2024 •

edited

Loading

openjdk bot commented Oct 30, 2024

mlbridge bot commented Oct 30, 2024 •

edited

Loading

bplb commented Oct 31, 2024

openjdk bot commented Oct 31, 2024

bplb left a comment

RogerRiggs Nov 1, 2024

jaikiran Nov 1, 2024

RogerRiggs left a comment

bplb left a comment

jaikiran commented Nov 8, 2024

jaikiran commented Nov 8, 2024

openjdk bot commented Nov 8, 2024

openjdk bot commented Nov 8, 2024

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m #21789

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m #21789

Conversation

jaikiran commented Oct 30, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Oct 30, 2024

openjdk bot commented Oct 30, 2024 • edited Loading

openjdk bot commented Oct 30, 2024

mlbridge bot commented Oct 30, 2024 • edited Loading

Webrevs

bplb commented Oct 31, 2024

openjdk bot commented Oct 31, 2024

bplb left a comment

Choose a reason for hiding this comment

RogerRiggs Nov 1, 2024

Choose a reason for hiding this comment

jaikiran Nov 1, 2024

Choose a reason for hiding this comment

RogerRiggs left a comment

Choose a reason for hiding this comment

bplb left a comment

Choose a reason for hiding this comment

jaikiran commented Nov 8, 2024

jaikiran commented Nov 8, 2024

openjdk bot commented Nov 8, 2024

openjdk bot commented Nov 8, 2024

jaikiran commented Oct 30, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Oct 30, 2024 •

edited

Loading

mlbridge bot commented Oct 30, 2024 •

edited

Loading