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

8313882: Fix -Wconversion warnings in runtime code #15177

Closed
wants to merge 22 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Aug 7, 2023

Here are fixes to silence -Wconversion warnings in runtime code. Use direct cast for 64 bit int to double, otherwise default to checked_cast<>. I changed the declaration of _held_monitor_count and _jni_monitor count to intx to fix cascade of warnings coming from this.

src/hotspot/share/runtime/synchronizer.cpp:1802:41: warning: conversion from 'intx' {aka 'long int'} to 'int' may change value [-Wconversion]
1802 | _thread->dec_held_monitor_count(rec + 1);
| ~~~~^~~

Tested with tier1-4 on linux-x64-debug and windows-x64-debug and tier1 on Oracle supported platforms.


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-8313882: Fix -Wconversion warnings in runtime code (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15177

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 7, 2023

👋 Welcome back coleenp! 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 added the rfr Pull request is ready for review label Aug 7, 2023
@openjdk
Copy link

openjdk bot commented Aug 7, 2023

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

  • graal
  • hotspot

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.

@openjdk openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Aug 7, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 7, 2023

src/hotspot/share/runtime/os.cpp Outdated Show resolved Hide resolved
src/hotspot/share/runtime/safepoint.cpp Show resolved Hide resolved
src/hotspot/share/runtime/threadHeapSampler.cpp Outdated Show resolved Hide resolved
src/hotspot/share/runtime/sharedRuntime.cpp Show resolved Hide resolved
Copy link
Contributor Author

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Thank you Dean and Patricio for your comments on this change.

src/hotspot/share/runtime/arguments.cpp Outdated Show resolved Hide resolved
src/hotspot/share/runtime/arguments.cpp Outdated Show resolved Hide resolved
src/hotspot/share/runtime/deoptimization.cpp Show resolved Hide resolved
src/hotspot/share/runtime/java.hpp Show resolved Hide resolved
src/hotspot/share/runtime/objectMonitor.hpp Outdated Show resolved Hide resolved
src/hotspot/share/runtime/os.cpp Outdated Show resolved Hide resolved
src/hotspot/share/runtime/safepoint.cpp Show resolved Hide resolved
src/hotspot/share/runtime/sharedRuntime.cpp Show resolved Hide resolved
src/hotspot/share/runtime/threadHeapSampler.cpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Aug 9, 2023

@coleenp this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout runtime-conversion
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Aug 9, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Aug 9, 2023
Copy link
Contributor

@pchilano pchilano left a comment

Choose a reason for hiding this comment

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

Thanks for the fixes. Looks good to me.

@openjdk
Copy link

openjdk bot commented Aug 9, 2023

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

8313882: Fix -Wconversion warnings in runtime code

Reviewed-by: pchilanomate, dlong, dholmes

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

  • c822183: 8313768: Reduce interaction with volatile field in j.u.l.StreamHandler
  • cd16158: 8314075: Update JCov version for JDK 22
  • c307391: 8307184: Incorrect/inconsistent specification and implementation for Elements.getDocComment
  • 593ba2f: 8313693: Introduce an internal utility for the Damerau–Levenshtein distance calculation
  • 360f65d: 8314022: Problem-list tests failing with jtreg 7.3
  • 0eb0997: 8288936: Wrong lock ordering writing G1HeapRegionTypeChange JFR event

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 openjdk bot added the ready Pull request is ready to be integrated label Aug 9, 2023
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Overall seems okay. A couple of minor comments.

Thanks.

src/hotspot/share/runtime/javaThread.hpp Show resolved Hide resolved
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Clicked wrong button :)

@coleenp
Copy link
Contributor Author

coleenp commented Aug 10, 2023

Thanks for the reviews, Patricio, Dean and David. I believe I addressed all the comments.
/integrate

@openjdk
Copy link

openjdk bot commented Aug 10, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 10, 2023

@coleenp Pushed as commit f47767f.

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

@coleenp coleenp deleted the runtime-conversion branch August 10, 2023 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants