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

8280459: Suspicious integer division in Hashtable.readHashtable #7178

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 21, 2022

Found by Sonar. See details in the bug.

Additional testing:

  • Linux x86_64 fastdebug tier1
  • Linux x86_64 fastdebug java/util/Hashtable

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8280459: Suspicious integer division in Hashtable.readHashtable

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7178/head:pull/7178
$ git checkout pull/7178

Update a local copy of the PR:
$ git checkout pull/7178
$ git pull https://git.openjdk.java.net/jdk pull/7178/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7178

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7178.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 21, 2022

👋 Welcome back shade! 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 Jan 21, 2022
@openjdk
Copy link

openjdk bot commented Jan 21, 2022

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Jan 21, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 21, 2022

Webrevs

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

LGTM. Seems reasonable though it might increase heap allocation of the array slightly.
In the example, the 28 would be reduced to 27 to make it odd.
With the new computation, its 29 or 2 additional refs.

@openjdk
Copy link

openjdk bot commented Jan 21, 2022

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

8280459: Suspicious integer division in Hashtable.readHashtable

Reviewed-by: rriggs, bpb

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

  • c1e4f3d: 8279397: Update --release 18 symbol information for JDK 18 build 32
  • 2920ce5: 8278036: Saving rscratch1 is optional in MacroAssembler::verify_heapbase
  • 6287ae3: 8277531: Print actual default stacksize on Windows thread logging
  • ab2c8d3: 8280393: Promote use of HtmlTree factory methods
  • 47b1c51: 8277120: Use Optional.isEmpty instead of !Optional.isPresent in java.net.http

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 Jan 21, 2022
@shipilev
Copy link
Member Author

Thanks for reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Jan 24, 2022

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

  • 9bf6ffa: 8279124: VM does not handle SIGQUIT during initialization
  • 30cd47d: 8280499: runtime/cds/appcds/TestDumpClassListSource.java fails on platforms without AppCDS custom class loaders support
  • 54c9de2: 8275918: Remove unused local variables in java.base security code
  • b9ae779: 8279675: CDS cannot handle non-existent JAR file in bootclassapth
  • c1e4f3d: 8279397: Update --release 18 symbol information for JDK 18 build 32
  • 2920ce5: 8278036: Saving rscratch1 is optional in MacroAssembler::verify_heapbase
  • 6287ae3: 8277531: Print actual default stacksize on Windows thread logging
  • ab2c8d3: 8280393: Promote use of HtmlTree factory methods
  • 47b1c51: 8277120: Use Optional.isEmpty instead of !Optional.isPresent in java.net.http

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 24, 2022

@shipilev Pushed as commit d156911.

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

@shipilev shipilev deleted the JDK-8280459-hashtable-susp-div branch January 27, 2022 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants