Skip to content

8303169: Remove Windows specific workaround from libdt#12744

Closed
TheShermanTanker wants to merge 3 commits intoopenjdk:masterfrom
TheShermanTanker:patch-6
Closed

8303169: Remove Windows specific workaround from libdt#12744
TheShermanTanker wants to merge 3 commits intoopenjdk:masterfrom
TheShermanTanker:patch-6

Conversation

@TheShermanTanker
Copy link
Contributor

@TheShermanTanker TheShermanTanker commented Feb 24, 2023

We no longer need to define PrId64 ourselves since the Visual C++ compiler supports inttypes.h on the only versions we support, so we can just replace it with an include to the standard header instead


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-8303169: Remove Windows specific workaround from libdt

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12744

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 24, 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
Copy link

openjdk bot commented Feb 24, 2023

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

  • serviceability

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 serviceability serviceability-dev@openjdk.org label Feb 24, 2023
@TheShermanTanker TheShermanTanker changed the title Remove Windows specific workaround from libdt 8303169: Remove Windows specific workaround from libdt Feb 24, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 24, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 24, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Feb 24, 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:

8303169: Remove Windows specific workaround from libdt

Reviewed-by: cjplummer, sspitsyn, clanger

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Feb 24, 2023
Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

Looks okay to me.
Thanks,
Serguei

@TheShermanTanker
Copy link
Contributor Author

Little bit of a quick note from me before integration, I found it strange that for other platforms no inttypes.h include was needed for PRId64 to work properly, but after more in depth checking to see whether the inttypes.h include should go elsewhere to match where the other platforms have it, apparently this is a Windows only library, making it all the more strange that a Windows conditional define was here at all in the first place. Just to be extra safe, is there confirmation that this will always be Windows only, and the the shared native code is somehow a mistake or leftover from long ago?

@TheShermanTanker
Copy link
Contributor Author

@RealCLanger Sorry for the ping, just wanted to check since you're the original commit Author for the format string, is there someplace else where inttypes.h or stdint.h is included or should be included that I missed?

@RealCLanger
Copy link
Contributor

@RealCLanger Sorry for the ping, just wanted to check since you're the original commit Author for the format string, is there someplace else where inttypes.h or stdint.h is included or should be included that I missed?

Hah, that was a long time ago. 😄 I think this change is fine - and I'm not aware of other places. But that doesn't mean a lot. 😉

@RealCLanger
Copy link
Contributor

PS I guess you should update the copyright year before pushing.

@TheShermanTanker
Copy link
Contributor Author

PS I guess you should update the copyright year before pushing.

Ah right, thanks for the reminder

@RealCLanger Sorry for the ping, just wanted to check since you're the original commit Author for the format string, is there someplace else where inttypes.h or stdint.h is included or should be included that I missed?

Hah, that was a long time ago. 😄 I think this change is fine - and I'm not aware of other places. But that doesn't mean a lot. 😉

I see haha, I was just worried since that's what the ifdef implied. Strange that the check was a #ifdef _WIN32 though since this is Windows only code (in fact I'm wondering why this file and the others in the same directory as it is in shared native code at all)

@TheShermanTanker
Copy link
Contributor Author

Ah I see, was the initial commit made with the assumption that inttypes.h was already included? It's just a final confirmation before integration

@RealCLanger
Copy link
Contributor

Ah I see, was the initial commit made with the assumption that inttypes.h was already included? It's just a final confirmation before integration

Could be.

@TheShermanTanker
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 27, 2023

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

  • f2b03f9: 8303051: Stop saving 5 chunks in each ChunkPool
  • fbc036e: 8303135: JFR: Log periodic events using periodic tag
  • dbb5581: 8081474: SwingWorker calls 'done' before the 'doInBackground' is finished
  • 306134d: 8300792: Refactor examples in java.net.http to use @snippet

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 27, 2023

@TheShermanTanker Pushed as commit 2fe4e5f.

💡 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 February 27, 2023 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

4 participants