8308544: Fix compilation regression from JDK-8306983 on musl libc #14080

jankratochvil · 2023-05-22T12:46:02Z

Since JDK-8306983 compilation on Alpine Linux using musl libc:

../src/jdk.internal.le/linux/native/lible/CLibrary.cpp: In function 'void Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_tcgetattr(JNIEnv*, jobject, jint, jobject)':
../src/jdk.internal.le/linux/native/lible/CLibrary.cpp:116:45: error: 'struct termios' has no member named 'c_ispeed'; did you mean '__c_ispeed'?
  116 | env->SetIntField(result, c_ispeed, data.c_ispeed);
      | ^~~~~~~~
      | __c_ispeed
../src/jdk.internal.le/linux/native/lible/CLibrary.cpp:117:45: error: 'struct termios' has no member named 'c_ospeed'; did you mean '__c_ospeed'?
  117 | env->SetIntField(result, c_ospeed, data.c_ospeed);
      | ^~~~~~~~
      | __c_ospeed
../src/jdk.internal.le/linux/native/lible/CLibrary.cpp: In function 'void Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_tcsetattr(JNIEnv*, jobject, jint, jint, jobject)':
../src/jdk.internal.le/linux/native/lible/CLibrary.cpp:136:10: error: 'struct termios' has no member named 'c_ispeed'; did you mean '__c_ispeed'?
  136 | data.c_ispeed = env->GetIntField(input, c_ispeed);
      | ^~~~~~~~
      | __c_ispeed
../src/jdk.internal.le/linux/native/lible/CLibrary.cpp:137:10: error: 'struct termios' has no member named 'c_ospeed'; did you mean '__c_ospeed'?
   ... (rest of output omitted)

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-8308544: Fix compilation regression from JDK-8306983 on musl libc

Reviewers

Brian Burkhalter (@bplb - Reviewer)
Thomas Stuefe (@tstuefe - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14080

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-05-22T12:47:37Z

👋 Welcome back jankratochvil! 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-05-22T12:49:19Z

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

kulla

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-05-22T12:52:48Z

Webrevs

01: Full - Incremental (4c1b4ab0)
00: Full (8265af14)

lahodaj · 2023-05-22T13:09:37Z

Looks good to me - but @bplb, could you please review? Thanks!

bplb

Looks all right.

openjdk · 2023-05-22T16:06:20Z

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

8308544: Fix compilation regression from JDK-8306983 on musl libc

Reviewed-by: bpb, stuefe

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

9e196b3: 8308565: HttpClient: Sanitize logging while stopping
582ddeb: 8308545: java/net/httpclient/ShutdownNow.java fails with "stream 1 cancelled"
1cfb265: 8307814: In the case of two methods with Record Patterns, the second one contains a line number from the first method
eb11508: 8308281: Java snippets in the FFM API need to be updated
26227a6: 8305073: Fix VerifyLoopOptimizations - step 2 - verify idom
80d7de7: 8305582: Compiler crash when compiling record patterns with var
e559613: 8308500: ZStatSubPhase::register_start should not call register_gc_phase_start if ZAbort::should_abort()
bdd2402: 8260943: C2 SuperWord: Remove dead vectorization optimization added by 8076284
4f0f776: 8308403: [s390x] separate remaining_cargs from z_abi_160
06b0a5e: 8302652: [SuperWord] Reduction should happen after loop, when possible
... and 18 more: https://git.openjdk.org/jdk/compare/dc30e686516d50bdc65542d440e1e428362efb67...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@bplb, @tstuefe) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

jankratochvil · 2023-05-22T20:12:13Z

/integrate

openjdk · 2023-05-22T20:13:14Z

@jankratochvil
Your change (at version 8265af1) is now ready to be sponsored by a Committer.

tstuefe

Okay. I had a slightly different fix, but I'll close that as duplicate: #14097

tstuefe · 2023-05-23T10:12:29Z

/sponsor

openjdk · 2023-05-23T10:27:16Z

@tstuefe The PR has been updated since the change author (@jankratochvil) issued the integrate command - the author must perform this command again.

tstuefe · 2023-05-23T11:18:44Z

@jankratochvil can you please repeat the integrate? Thanks.

jankratochvil · 2023-05-23T12:08:10Z

@jankratochvil can you please repeat the integrate? Thanks.

I did not want to as I have realized my openjdk commits go with wrong e-mail address (not @openjdk.org). So I have filed now https://bugs.openjdk.org/browse/SKARA-1915 which should hopefully fix it but it has not been processed yet.

tstuefe · 2023-05-23T12:18:53Z

@jankratochvil can you please repeat the integrate? Thanks.

I did not want to as I have realized my openjdk commits go with wrong e-mail address (not @openjdk.org). So I have filed now https://bugs.openjdk.org/browse/SKARA-1915 which should hopefully fix it but it has not been processed yet.

Is this really important? Build fixes are time critical. Let's just hope this skara bug gets resolved quickly.

jankratochvil · 2023-05-23T12:22:43Z

/integrate

jankratochvil · 2023-05-23T12:24:06Z

Is this really important? Build fixes are time critical.

It is not important. I rather have not found much urgent the Alpine Linux fix. So I have done the /integrate.

openjdk · 2023-05-23T12:34:56Z

@jankratochvil
Your change (at version 4c1b4ab) is now ready to be sponsored by a Committer.

jankratochvil · 2023-05-23T13:29:31Z

My e-mail address ticket https://bugs.openjdk.org/browse/SKARA-1915 is now even already resolved.

tstuefe · 2023-05-23T13:44:38Z

@jankratochvil Great, thanks.

/sponsor

openjdk · 2023-05-23T13:53:11Z

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

9e196b3: 8308565: HttpClient: Sanitize logging while stopping
582ddeb: 8308545: java/net/httpclient/ShutdownNow.java fails with "stream 1 cancelled"
1cfb265: 8307814: In the case of two methods with Record Patterns, the second one contains a line number from the first method
eb11508: 8308281: Java snippets in the FFM API need to be updated
26227a6: 8305073: Fix VerifyLoopOptimizations - step 2 - verify idom
80d7de7: 8305582: Compiler crash when compiling record patterns with var
e559613: 8308500: ZStatSubPhase::register_start should not call register_gc_phase_start if ZAbort::should_abort()
bdd2402: 8260943: C2 SuperWord: Remove dead vectorization optimization added by 8076284
4f0f776: 8308403: [s390x] separate remaining_cargs from z_abi_160
06b0a5e: 8302652: [SuperWord] Reduction should happen after loop, when possible
... and 18 more: https://git.openjdk.org/jdk/compare/dc30e686516d50bdc65542d440e1e428362efb67...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-05-23T13:56:59Z

@tstuefe @jankratochvil Pushed as commit c0c4d77.

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

8308544: Fix compilation regression from JDK-8306983 on musl libc

8265af1

openjdk bot added the rfr label May 22, 2023

openjdk bot added the kulla label May 22, 2023

bplb approved these changes May 22, 2023

View reviewed changes

openjdk bot added the ready label May 22, 2023

openjdk bot added the sponsor label May 22, 2023

Change author's e-mail.

4c1b4ab

openjdk bot removed the sponsor label May 23, 2023

tstuefe reviewed May 23, 2023

View reviewed changes

tstuefe approved these changes May 23, 2023

View reviewed changes

tstuefe mentioned this pull request May 23, 2023

JDK-8308627: JDK-8306983 breaks Alpine #14097

Closed

3 tasks

openjdk bot added the sponsor label May 23, 2023

openjdk bot added the integrated label May 23, 2023

openjdk bot closed this May 23, 2023

openjdk bot removed ready rfr sponsor labels May 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8308544: Fix compilation regression from JDK-8306983 on musl libc #14080

8308544: Fix compilation regression from JDK-8306983 on musl libc #14080

jankratochvil commented May 22, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented May 22, 2023

openjdk bot commented May 22, 2023

mlbridge bot commented May 22, 2023 •

edited

Loading

lahodaj commented May 22, 2023

bplb left a comment

openjdk bot commented May 22, 2023 •

edited

Loading

jankratochvil commented May 22, 2023

openjdk bot commented May 22, 2023

tstuefe left a comment •

edited

Loading

tstuefe commented May 23, 2023

openjdk bot commented May 23, 2023

tstuefe commented May 23, 2023 •

edited

Loading

jankratochvil commented May 23, 2023

tstuefe commented May 23, 2023

jankratochvil commented May 23, 2023

jankratochvil commented May 23, 2023

openjdk bot commented May 23, 2023

jankratochvil commented May 23, 2023

tstuefe commented May 23, 2023

openjdk bot commented May 23, 2023

openjdk bot commented May 23, 2023

8308544: Fix compilation regression from JDK-8306983 on musl libc #14080

8308544: Fix compilation regression from JDK-8306983 on musl libc #14080

Conversation

jankratochvil commented May 22, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented May 22, 2023

openjdk bot commented May 22, 2023

mlbridge bot commented May 22, 2023 • edited Loading

Webrevs

lahodaj commented May 22, 2023

bplb left a comment

Choose a reason for hiding this comment

openjdk bot commented May 22, 2023 • edited Loading

jankratochvil commented May 22, 2023

openjdk bot commented May 22, 2023

tstuefe left a comment • edited Loading

Choose a reason for hiding this comment

tstuefe commented May 23, 2023

openjdk bot commented May 23, 2023

tstuefe commented May 23, 2023 • edited Loading

jankratochvil commented May 23, 2023

tstuefe commented May 23, 2023

jankratochvil commented May 23, 2023

jankratochvil commented May 23, 2023

openjdk bot commented May 23, 2023

jankratochvil commented May 23, 2023

tstuefe commented May 23, 2023

openjdk bot commented May 23, 2023

openjdk bot commented May 23, 2023

jankratochvil commented May 22, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented May 22, 2023 •

edited

Loading

openjdk bot commented May 22, 2023 •

edited

Loading

tstuefe left a comment •

edited

Loading

tstuefe commented May 23, 2023 •

edited

Loading