Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8311380: Prepare java.desktop for C++17 #14795

Closed
wants to merge 17 commits into from

Conversation

TheShermanTanker
Copy link
Contributor

@TheShermanTanker TheShermanTanker commented Jul 7, 2023

Despite the fancy name, all this change does is move a few standard library headers to the top so macro definitions don't break them, remove the register specifiers from allocation methods, and remove dynamic exception specifiers from AWT code


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-8311380: Prepare java.desktop for C++17 (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14795

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

Using diff file

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

Webrev

Link to Webrev Comment

@TheShermanTanker TheShermanTanker marked this pull request as draft July 7, 2023 01:56
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 7, 2023

👋 Welcome back jwaters! 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 openjdk bot changed the title 8311380 8311380: Prepare java.desktop for C++17 Jul 7, 2023
@openjdk
Copy link

openjdk bot commented Jul 7, 2023

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

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Jul 7, 2023
@TheShermanTanker TheShermanTanker marked this pull request as ready for review July 7, 2023 02:20
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 7, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 7, 2023

Webrevs

@TheShermanTanker
Copy link
Contributor Author

Bumping

@mrserb
Copy link
Member

mrserb commented Jul 11, 2023

move a few standard library headers to the top so macro definitions don't break them

Just to double check, do we have such macro definitions?

@TheShermanTanker
Copy link
Contributor Author

We include windows.h in a vast amount of source files, which defines min and max utilities. This breaks the min max declarations from the standard library cmath header. -DNOMINMAX is not possible because a lot of code does actually use the min and max macros

throw std::bad_alloc();
}

return ret_val;
return nullptr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be the ptr?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, you're right. Good catch!

@openjdk
Copy link

openjdk bot commented Jul 12, 2023

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

8311380: Prepare java.desktop for C++17

Reviewed-by: azvegint

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

  • 372d0cf: 8311545: Allow test symbol files to be kept in the test image
  • 489a32f: 8311813: C1: Uninitialized PhiResolver::_loop field
  • 119cc49: 8156889: ListKeychainStore.sh fails in some virtualized environments
  • ed9337e: 8155902: DataOuputStream should clarify that it might write primitive types as multiple byte groups
  • f82c818: 8308694: Clarify reversed() default methods' implementation requirements
  • 7304316: 8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
  • aa7367f: 8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
  • 753bd56: 8311870: Split CompressedKlassPointers from compressedOops.hpp
  • 0b0e064: 8311656: Shenandoah: Unused ShenandoahSATBAndRemarkThreadsClosure::_claim_token
  • fd7fddb: 8295894: Remove SECOM certificate that is expiring in September 2023
  • ... and 31 more: https://git.openjdk.org/jdk/compare/27de536b409aa80c8b8bb452160329be52814e0b...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 openjdk bot added the ready Pull request is ready to be integrated label Jul 12, 2023
@TheShermanTanker
Copy link
Contributor Author

Thanks!

@TheShermanTanker
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 13, 2023

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

  • 743e8b8: 8306785: fix deficient spliterators for Sequenced Collections
  • 372d0cf: 8311545: Allow test symbol files to be kept in the test image
  • 489a32f: 8311813: C1: Uninitialized PhiResolver::_loop field
  • 119cc49: 8156889: ListKeychainStore.sh fails in some virtualized environments
  • ed9337e: 8155902: DataOuputStream should clarify that it might write primitive types as multiple byte groups
  • f82c818: 8308694: Clarify reversed() default methods' implementation requirements
  • 7304316: 8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
  • aa7367f: 8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
  • 753bd56: 8311870: Split CompressedKlassPointers from compressedOops.hpp
  • 0b0e064: 8311656: Shenandoah: Unused ShenandoahSATBAndRemarkThreadsClosure::_claim_token
  • ... and 32 more: https://git.openjdk.org/jdk/compare/27de536b409aa80c8b8bb452160329be52814e0b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 13, 2023
@openjdk openjdk bot closed this Jul 13, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 13, 2023
@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@TheShermanTanker Pushed as commit fb90af8.

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

@TheShermanTanker TheShermanTanker deleted the patch-6 branch July 13, 2023 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants