-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8286378: Address possibly lossy conversions in java.base #8642
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
Conversation
Add explicit casts to replace implicit casts
|
👋 Welcome back rriggs! A progress list of the required criteria for merging this PR into |
|
@RogerRiggs The following labels will be automatically applied to this pull request:
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. |
Webrevs
|
naotoj
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Assuming copyright years will be updated.
|
@RogerRiggs 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: 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 19 new commits pushed to the
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 |
XueleiFan
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The update in security area looks good to me.
bplb
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IO, math, and NIO changes look fine.
|
I can confirm this patch clears all warnings from java.base. |
Fixed cast style to add a space after cast, (where consistent with file style) Improved code per review comments in PollSelectors.
|
/integrate |
|
Going to push as commit 17c5278.
Your commit was automatically rebased without conflicts. |
|
@RogerRiggs Pushed as commit 17c5278. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
| // timed poll interrupted so need to adjust timeout | ||
| long adjust = System.nanoTime() - startTime; | ||
| to -= TimeUnit.MILLISECONDS.convert(adjust, TimeUnit.NANOSECONDS); | ||
| to =- (int) TimeUnit.NANOSECONDS.toMillis(adjust); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will now always assign a negative number to to.
=- is not a compound assignment, it’s negation followed by a normal assignment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well spotted, I don't think that change was intentionally.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ouch; Will fix:
I took Alan's earlier comment literally:
"This one can also be changed to:
to =- (int) TimeUnit.NANOSECONDS.toMillis(adjust);"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RogerRiggs
This already got fixed by @jaikiran in GH‑8693.
PR#8599 8244681: proposes to add compiler warnings for possible lossy conversions
From the CSR:
"If the type of the right-hand operand of a compound assignment is not assignment compatible with the type of the variable, a cast is implied and possible lossy conversion may silently occur. While similar situations are resolved as compilation errors for primitive assignments, there are no similar rules defined for compound assignments."
This PR anticipates the warnings and adds explicit casts to replace the implicit casts.
In most cases, the cast matches the type of the right-hand side to type of the compound assignment.
Since these casts are truncating the value, there might be a different refactoring that avoids the cast
but a direct replacement was chosen here.
(Advise and suggestions will inform similar updates to other OpenJDK modules).
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8642/head:pull/8642$ git checkout pull/8642Update a local copy of the PR:
$ git checkout pull/8642$ git pull https://git.openjdk.java.net/jdk pull/8642/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 8642View PR using the GUI difftool:
$ git pr show -t 8642Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8642.diff