8347143: [aix] Fix strdup use in os::dll_load #23078

JoKern65 · 2025-01-13T15:21:43Z

The use of strdup (which is os::strdup because of context) in aix's os::dll_load is odd. The result is nearly unused (it's passed to strrchr, but the original filename could be used instead), so the duplication doesn't seem needed. And the duplicate is free'd using FREE_C_HEAP_ARRAY, which seems wrong.

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-8347143: [aix] Fix strdup use in os::dll_load (Enhancement - P4)

Reviewers

Martin Doerr (@TheRealMDoerr - Reviewer)
Christoph Langer (@RealCLanger - Reviewer)
Kim Barrett (@kimbarrett - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23078

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-01-13T15:22:26Z

👋 Welcome back jkern! 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 · 2025-01-13T15:24:05Z

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

8347143: [aix] Fix strdup use in os::dll_load

Reviewed-by: mdoerr, clanger, kbarrett

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:

3e989fd: 8346986: Remove ASM from java.base
3967696: 8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac

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 · 2025-01-13T15:25:07Z

@JoKern65 The following label will be automatically applied to this pull request:

hotspot-runtime

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 · 2025-01-13T15:27:51Z

Webrevs

TheRealMDoerr

I think there was no bug, but the new code is clearly better. @kimbarrett: Do you agree?

TheRealMDoerr · 2025-01-13T16:37:42Z

Please update the Copyright header!

RealCLanger

The new code is definitely better, good work. From eyeballing it, I also think it is correct. 😄 While you're at it, I have two other style nits that could be fixed.

RealCLanger · 2025-01-13T16:49:44Z

src/hotspot/os/aix/os_aix.cpp

  const char old_extension[] = ".so";
  const char new_extension[] = ".a";
-  STATIC_ASSERT(sizeof(old_extension) >= sizeof(new_extension));
  // First try to load the existing file.
  int eno=0;


Suggested change

int eno=0;

int eno = 0;

RealCLanger · 2025-01-13T16:49:59Z

src/hotspot/os/aix/os_aix.cpp

  const char old_extension[] = ".so";
  const char new_extension[] = ".a";
-  STATIC_ASSERT(sizeof(old_extension) >= sizeof(new_extension));
  // First try to load the existing file.
  int eno=0;
  result = dll_load_library(filename, &eno, ebuf, ebuflen);
  // If the load fails,we try to reload by changing the extension to .a for .so files only.


Suggested change

// If the load fails,we try to reload by changing the extension to .a for .so files only.

// If the load fails, we try to reload by changing the extension to .a for .so files only.

kimbarrett

Looks good.

kimbarrett

Still good.

openjdk · 2025-01-14T05:03:01Z

@JoKern65 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 JDK-8347143
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

JoKern65 · 2025-01-14T15:39:12Z

/integrate

openjdk · 2025-01-14T15:39:50Z

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

dfd215b: 8347376: tools/jlink/runtimeImage/JavaSEReproducibleTest.java and PackagedModulesVsRuntimeImageLinkTest.java failed after JDK-8321413
a49f833: 8346045: Cleanup of security library tests calling Security Manager APIs
56c7800: 8347381: Upgrade jQuery UI to version 1.14.1
1c64a45: 8347501: Make static-launcher fails after JDK-8346669
b4cd3b1: 8347566: Replace SSIZE_FORMAT with 'z' length modifier
f0af830: 8335747: C2: fix overflow case for LoopLimit with constant inputs
fec769b: 8346778: Enable native access should work with the source launcher
cbb2b84: 8344130: C2: Avoid excessive hoisting in scheduler due to minuscule differences in block frequency
bb93f67: 8347646: module-info classfile missing the preview flag
3e989fd: 8346986: Remove ASM from java.base
... and 1 more: https://git.openjdk.org/jdk/compare/6eb83ef874cfb7244a8be40236f8845eaa756082...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-01-14T15:39:57Z

@JoKern65 Pushed as commit d532019.

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

JDK-8347143

8022647

openjdk bot changed the title ~~JDK-8347143: [aix] Fix strdup use in os::dll_load~~ 8347143: [aix] Fix strdup use in os::dll_load Jan 13, 2025

openjdk bot added the rfr Pull request is ready for review label Jan 13, 2025

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jan 13, 2025

TheRealMDoerr approved these changes Jan 13, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2025

Copyright dates

ef6b252

openjdk bot removed the ready Pull request is ready to be integrated label Jan 13, 2025

TheRealMDoerr approved these changes Jan 13, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2025

RealCLanger approved these changes Jan 13, 2025

View reviewed changes

kimbarrett approved these changes Jan 13, 2025

View reviewed changes

Cosmetic changes

a7cd928

openjdk bot removed the ready Pull request is ready to be integrated label Jan 13, 2025

RealCLanger approved these changes Jan 13, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2025

TheRealMDoerr approved these changes Jan 13, 2025

View reviewed changes

kimbarrett approved these changes Jan 14, 2025

View reviewed changes

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jan 14, 2025

Merge master

8c4be46

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jan 14, 2025

TheRealMDoerr approved these changes Jan 14, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025

RealCLanger approved these changes Jan 14, 2025

View reviewed changes

kimbarrett approved these changes Jan 14, 2025

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 14, 2025

openjdk bot closed this Jan 14, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8347143: [aix] Fix strdup use in os::dll_load #23078

8347143: [aix] Fix strdup use in os::dll_load #23078

JoKern65 commented Jan 13, 2025 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jan 13, 2025

openjdk bot commented Jan 13, 2025 •

edited

Loading

openjdk bot commented Jan 13, 2025

mlbridge bot commented Jan 13, 2025 •

edited

Loading

TheRealMDoerr left a comment

TheRealMDoerr commented Jan 13, 2025

RealCLanger left a comment

RealCLanger Jan 13, 2025

RealCLanger Jan 13, 2025

kimbarrett left a comment

kimbarrett left a comment

openjdk bot commented Jan 14, 2025

JoKern65 commented Jan 14, 2025

openjdk bot commented Jan 14, 2025

openjdk bot commented Jan 14, 2025

	// If the load fails,we try to reload by changing the extension to .a for .so files only.
	// If the load fails, we try to reload by changing the extension to .a for .so files only.

8347143: [aix] Fix strdup use in os::dll_load #23078

8347143: [aix] Fix strdup use in os::dll_load #23078

Conversation

JoKern65 commented Jan 13, 2025 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 13, 2025

openjdk bot commented Jan 13, 2025 • edited Loading

openjdk bot commented Jan 13, 2025

mlbridge bot commented Jan 13, 2025 • edited Loading

Webrevs

TheRealMDoerr left a comment

Choose a reason for hiding this comment

TheRealMDoerr commented Jan 13, 2025

RealCLanger left a comment

Choose a reason for hiding this comment

RealCLanger Jan 13, 2025

Choose a reason for hiding this comment

RealCLanger Jan 13, 2025

Choose a reason for hiding this comment

kimbarrett left a comment

Choose a reason for hiding this comment

kimbarrett left a comment

Choose a reason for hiding this comment

openjdk bot commented Jan 14, 2025

JoKern65 commented Jan 14, 2025

openjdk bot commented Jan 14, 2025

openjdk bot commented Jan 14, 2025

JoKern65 commented Jan 13, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jan 13, 2025 •

edited

Loading

mlbridge bot commented Jan 13, 2025 •

edited

Loading