8329672: Only call SetupNativeCompilation from SetupJdkNativeCompilation

[magicus]

This patch will fix the few remaining places where a "raw" call to SetupNativeCompilation was made, instead of going via SetupJdkNativeCompilation. This include repairing the poor old X11Wrapper, which has been broken for some time.

After this we can finally make SetupNativeCompilation an "inner macro" of SetupJdkNativeCompilation, and stop exposing two different ways of compiling native code.

I have also added standard header comments to some places where I have missed it, and corrected an incorrect indentation (all things I found while double-checking all SetupJdkNativeCompilation calls).

---

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-8329672: Only call SetupNativeCompilation from SetupJdkNativeCompilation (Bug - P3)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18631

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back ihse! 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]

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

8329672: Only call SetupNativeCompilation from SetupJdkNativeCompilation

Reviewed-by: erikj

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

• e1183ac: 8329703: Remove unused apple.jpeg file from SwingSet2 demo
• 12ad09a: 8322042: HeapDumper should perform merge on the current thread instead of VMThread
• d80d478: 8328649: Disallow enclosing instances for local classes in constructor prologues
• 83eba86: 8329332: Remove CompiledMethod and CodeBlobLayout classes
• 28216aa: 8328366: Thread.setContextClassloader from thread in FJP commonPool task no longer works after JDK-8327501
• 4276d5c: 8329637: Apparent typo in java.security file property jdk.tls.keyLimits
• 6382a12: 8326666: Remove the Java Management Extension (JMX) Subject Delegation feature
• d90e5b5: 8329546: Assume sized integral types are available
• f3db279: 8327410: Add hostname option for UL file names

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]

@magicus The following labels will be automatically applied to this pull request:

• build
• client
• core-libs
• net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[magicus]

/label -client -core-libs -net

[openjdk]

@magicus
The client label was successfully removed.

The core-libs label was successfully removed.

The net label was successfully removed.

[mlbridge]

Webrevs

• 01: Full - Incremental (ecd86477)
• 00: Full (a592e19f)

[erikj79]

Looks like windows build is failing in GHA.

[magicus]

Looks like windows build is failing in GHA.

I see. I thought it passed on my local Windows testing, but I might have done some changes (that I thought were "trivial") afterwards, since I see that it breaks there now as well. :-(

[magicus]

Just to confirm; this PR now passes with byte-by-byte identical builds compared to master.

[magicus]

/integrate

[openjdk]

@magicus This pull request has not yet been marked as ready for integration.

[magicus]

/integrate

[openjdk]

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

• 8bc1867: 8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler
• 8efe569: 8328747: WrongMethodTypeException with pattern matching on switch on sealed classes
• 71d48bc: 8329655: Cleanup KlassObj and klassOop names after the PermGen removal
• b71acc7: 8329089: Empty immutable list throws the wrong exception type for remove(first | last) operations
• 1131bb7: 8329261: G1: interpreter post-barrier x86 code asserts index size of wrong buffer
• 6bc6392: 8329201: C2: Replace TypeInterfaces::intersection_with() + eq() with contains()
• 9da5170: 8327978: C2 SuperWord: Fix compilation time regression in dependency graph traversal after JDK-8325651
• c1cfb43: 8329109: Threads::print_on() tries to print CPU time for terminated GC threads
• 5860a48: 8329624: Add visitors for preview language features
• 0b01144: 8329720: Gtest failure printing markword after JDK-8325303
• ... and 11 more: https://git.openjdk.org/jdk/compare/21867c929a2f2c961148f2cd1e79d672ac278d27...master

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus An unexpected error occurred during integration. No push attempt will be made. The error has been logged and will be investigated. It is possible that this error is caused by a transient issue; feel free to retry the operation.

[magicus]

/integrate

[openjdk]

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

• 8bc1867: 8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler
• 8efe569: 8328747: WrongMethodTypeException with pattern matching on switch on sealed classes
• 71d48bc: 8329655: Cleanup KlassObj and klassOop names after the PermGen removal
• b71acc7: 8329089: Empty immutable list throws the wrong exception type for remove(first | last) operations
• 1131bb7: 8329261: G1: interpreter post-barrier x86 code asserts index size of wrong buffer
• 6bc6392: 8329201: C2: Replace TypeInterfaces::intersection_with() + eq() with contains()
• 9da5170: 8327978: C2 SuperWord: Fix compilation time regression in dependency graph traversal after JDK-8325651
• c1cfb43: 8329109: Threads::print_on() tries to print CPU time for terminated GC threads
• 5860a48: 8329624: Add visitors for preview language features
• 0b01144: 8329720: Gtest failure printing markword after JDK-8325303
• ... and 11 more: https://git.openjdk.org/jdk/compare/21867c929a2f2c961148f2cd1e79d672ac278d27...master

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus Pushed as commit 3f4b167.

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