8318091: Remove empty initIDs functions by djelinski · Pull Request #16372 · openjdk/jdk

djelinski · 2023-10-26T06:56:16Z

The removed functions are empty on all platforms.

This patch also removes calls to Toolkit.loadLibraries(); in classes that no longer have any native methods. The call was needed to ensure that the native awt library is loaded.

Client libs tests passed.

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-8318091: Remove empty initIDs functions (Sub-task - P4)

Reviewers

Phil Race (@prrace - Reviewer)
Alexey Ivanov (@aivanov-jdk - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16372

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-10-26T06:57:02Z

👋 Welcome back djelinski! 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 · 2023-10-26T07:00:11Z

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

client

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 · 2023-10-26T10:41:41Z

Webrevs

00: Full (d044f1f9)

prrace · 2023-10-26T19:25:29Z

So this looks OK. The main thing I would worry about is that there isn't some code path which needs
the call to Toolkit.loadLibraries(), wasn't doing it itself, and gets by only because the libraries were loaded
by one of these calls being removed.

It is difficult to prove there is no such case. Tests may not be 100% coverage of all code paths.
Of course in such a case it is really a bug in that other code path, so if it shows up the fix would
likely be there rather than reverting some part of this change.

openjdk · 2023-10-26T19:26:35Z

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

8318091: Remove empty initIDs functions

Reviewed-by: prr, aivanov

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

667cca9: 8288899: java/util/concurrent/ExecutorService/CloseTest.java failed with "InterruptedException: sleep interrupted"
b9dcd4b: 8318964: Fix build failures caused by 8315097
d52a995: 8315097: Rename createJavaProcessBuilder
957703b: 8307168: Inconsistent validation and handling of --system flag arguments
5b5fd36: 8316632: Shenandoah: Raise OOME when gc threshold is exceeded
abad040: 8313781: Add regression tests for large page logging and user-facing error messages
9123961: 8318096: Introduce AsymmetricKey interface with a getParams method
4a142c3: 8274122: java/io/File/createTempFile/SpecialTempFile.java fails in Windows 11
77fe0fd: 8272215: Add InetAddress methods for parsing IP address literals
a9b31b5: 8318689: jtreg is confused when folder name is the same as the test name
... and 10 more: https://git.openjdk.org/jdk/compare/723db2dc8651efb9e5da7754cbefb80f4171a367...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.

aivanov-jdk

It looks good to me. The only concern I have, similar to Phil, is that peer implementations do not load the toolkit libraries. For this reason, I am for keeping the call to Toolkit.loadLibraries() in the static initializer of java.awt.Button, java.awt.FileDialog, java.awt.KeyboardFocusManager and java.awt.TextField.

aivanov-jdk · 2023-10-27T10:26:26Z

src/java.desktop/share/classes/java/awt/Button.java

-    static {
-        /* ensure that the necessary native libraries are loaded */
-        Toolkit.loadLibraries();


I think it is safer to preserve loading the toolkit libraries: Button is a peered component and I can't see any of the peers loads the libraries.

Button extends Component, which loads libraries

another thing to note is that the peers are created by the toolkit which init awt lib on startup.

aivanov-jdk · 2023-10-27T10:38:00Z

src/java.desktop/share/classes/java/awt/FileDialog.java

-
-    static {
-        /* ensure that the necessary native libraries are loaded */
-        Toolkit.loadLibraries();


The same is here: I see no clear path to load the toolkit libraries from the peers, and peers do have native methods, including initIDs.

It looks as if peer implementations depend on the fact that the corresponding public API classes ensure the libraries are loaded.

FileDialog extends Dialog, which loads libraries

aivanov-jdk · 2023-10-27T11:09:58Z

Button extends Component, which loads libraries
FileDialog extends Dialog, which loads libraries

Then it's handled, obviously. TextField falls into the same category.

And KeyboardFocusManager will also load the libraries because it depends on the Toolkit class which, in its turn, loads the libraries.

We're good then, no further changes needed. Thank you!

djelinski · 2023-10-27T16:06:38Z

/integrate

openjdk · 2023-10-27T16:09:28Z

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

4f9f195: 8318753: hsdis binutils may place libs in lib64
2915d74: 8318837: javac generates wrong ldc instruction for dynamic constant loads
ddd0716: 8317661: [REDO] store/load order not preserved when handling memory pool due to weakly ordered memory architecture of aarch64
141dae8: 8318811: Compiler directives parser swallows a character after line comments
667cca9: 8288899: java/util/concurrent/ExecutorService/CloseTest.java failed with "InterruptedException: sleep interrupted"
b9dcd4b: 8318964: Fix build failures caused by 8315097
d52a995: 8315097: Rename createJavaProcessBuilder
957703b: 8307168: Inconsistent validation and handling of --system flag arguments
5b5fd36: 8316632: Shenandoah: Raise OOME when gc threshold is exceeded
abad040: 8313781: Add regression tests for large page logging and user-facing error messages
... and 14 more: https://git.openjdk.org/jdk/compare/723db2dc8651efb9e5da7754cbefb80f4171a367...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-10-27T16:09:35Z

@djelinski Pushed as commit c593f8b.

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

djelinski added 6 commits October 26, 2023 08:27

Remove Color_initIDs

df2baaa

Remove KeyboardFocusManager_initIDs

48e89ba

Remove Rectangle_initIDs

4a7013e

Remove Button_initIDs

91e717d

Remove FileDialog_initIDs

34d891c

Remove TextField_initIDs

d044f1f

openjdk bot changed the title ~~8318091~~ 8318091: Remove empty initIDs functions Oct 26, 2023

openjdk bot added the client client-libs-dev@openjdk.org label Oct 26, 2023

djelinski marked this pull request as ready for review October 26, 2023 10:37

openjdk bot added the rfr Pull request is ready for review label Oct 26, 2023

prrace approved these changes Oct 26, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 26, 2023

aivanov-jdk approved these changes Oct 27, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Oct 27, 2023

openjdk bot closed this Oct 27, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 27, 2023

djelinski deleted the desktop-initids branch October 27, 2023 16:09

Conversation

djelinski commented Oct 26, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Oct 26, 2023

Uh oh!

openjdk bot commented Oct 26, 2023

Uh oh!

mlbridge bot commented Oct 26, 2023

Webrevs

Uh oh!

prrace commented Oct 26, 2023

Uh oh!

openjdk bot commented Oct 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aivanov-jdk left a comment

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Oct 27, 2023

Choose a reason for hiding this comment

Uh oh!

djelinski Oct 27, 2023

Choose a reason for hiding this comment

Uh oh!

mrserb Nov 7, 2023

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Oct 27, 2023

Choose a reason for hiding this comment

Uh oh!

djelinski Oct 27, 2023

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk commented Oct 27, 2023

Uh oh!

djelinski commented Oct 27, 2023

Uh oh!

openjdk bot commented Oct 27, 2023

Uh oh!

openjdk bot commented Oct 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

djelinski commented Oct 26, 2023 •

edited by openjdk bot

Loading

openjdk bot commented Oct 26, 2023 •

edited

Loading