8313564: Fix -Wconversion warnings in classfile code by coleenp · Pull Request #15111 · openjdk/jdk

coleenp · 2023-08-01T19:50:37Z

This patch fixes various -Wconversion warnings in classfile code. I broke the change into commits so the changes are easier to see.
Tested with tier1-4.

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-8313564: Fix -Wconversion warnings in classfile code (Enhancement - P4)

Reviewers

Matias Saavedra Silva (@matias9927 - Committer) ⚠️ Review applies to 0e97905c
David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to a092d427

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15111

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-08-01T19:51:52Z

👋 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 · 2023-08-01T19:53:44Z

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

mlbridge · 2023-08-01T19:57:42Z

Webrevs

…h. prefetch_data_size() returns uint, so added a checked_cast<> to catch the case where it would return greater than signed int max.

matias9927

Thanks for this! I have a few questions and potential improvements, but overall this looks good!

src/hotspot/share/classfile/altHashing.cpp

src/hotspot/share/classfile/classFileParser.cpp

src/hotspot/share/classfile/symbolTable.cpp

matias9927 · 2023-08-02T18:57:46Z

src/hotspot/share/classfile/symbolTable.cpp

  if (_symbols_counted > 0) {
    tty->print_cr("  Percent removed          %3.2f",
-          ((float)_symbols_removed / _symbols_counted) * 100);
+          ((float)_symbols_removed / (float)_symbols_counted) * 100);


I think you can also just cast once here.

These should probably be double rather than float - the float result will be promoted to double to be passed as an argument anyway.

Changed to double.

matias9927 · 2023-08-02T18:58:01Z

src/hotspot/share/classfile/symbolTable.cpp

  tty->print_cr("  Total symbol length      " SIZE_FORMAT_W(7), hi.total_length);
  tty->print_cr("  Maximum symbol length    " SIZE_FORMAT_W(7), hi.max_length);
-  tty->print_cr("  Average symbol length    %7.2f", ((float)hi.total_length / hi.total_count));
+  tty->print_cr("  Average symbol length    %7.2f", ((float)hi.total_length / (float)hi.total_count));


I think each value needs to be cast to get the correct result.

Yes size_t values must be cast to float/double. Again I think double should be used here.

Also changed to double.

coleenp

Thanks for looking at this in detail Matias and for asking questions. I hope I've answered them sufficiently.

src/hotspot/share/classfile/altHashing.cpp

src/hotspot/share/classfile/symbolTable.cpp

coleenp · 2023-08-02T19:19:15Z

src/hotspot/share/classfile/symbolTable.cpp

  tty->print_cr("  Total symbol length      " SIZE_FORMAT_W(7), hi.total_length);
  tty->print_cr("  Maximum symbol length    " SIZE_FORMAT_W(7), hi.max_length);
-  tty->print_cr("  Average symbol length    %7.2f", ((float)hi.total_length / hi.total_count));
+  tty->print_cr("  Average symbol length    %7.2f", ((float)hi.total_length / (float)hi.total_count));


I think each value needs to be cast to get the correct result.

src/hotspot/share/classfile/classFileParser.cpp

matias9927

Thank you for addressing my questions, it looks like everything is good then!

dholmes-ora

A couple of queries/comments but overall seems reasonable.

Thanbks.

src/hotspot/share/classfile/loaderConstraints.cpp

src/hotspot/share/classfile/stringTable.cpp

src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp

openjdk · 2023-08-02T23:40:37Z

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

8313564: Fix -Wconversion warnings in classfile code

Reviewed-by: matsaave, 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 44 new commits pushed to the master branch:

e8a37b9: 8313248: C2: setScopedValueCache intrinsic exposes nullptr pre-values to store barriers
29f1d8e: 8313707: GHA: Bootstrap sysroots with --variant=minbase
61c58fd: 8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
5d23295: 8313251: Add NativeLibraryLoad event
c4b8574: 8311938: Add default cups include location for configure on AIX
10a2605: 8294979: test/jdk/tools/jlink 3 test classes use ASM library
e8c325d: 8313394: Array Elements in OldObjectSample event has the incorrect description
d60352e: 8311006: missing @SInCE info in jdk.xml.dom
4577147: 8313712: [BACKOUT] 8313632: ciEnv::dump_replay_data use fclose
bb3aac6: 8301606: JFileChooser file chooser details view "size" label cut off in Metal Look&Feel
... and 34 more: https://git.openjdk.org/jdk/compare/ee3e0917b393b879a543060ace2537be84f20e82...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.

coleenp

Thanks for reviewing, David. Reran with -Wconversion and now tier1 on your suggestions.

src/hotspot/share/classfile/loaderConstraints.cpp

src/hotspot/share/classfile/stringTable.cpp

coleenp · 2023-08-03T00:06:35Z

src/hotspot/share/classfile/symbolTable.cpp

  if (_symbols_counted > 0) {
    tty->print_cr("  Percent removed          %3.2f",
-          ((float)_symbols_removed / _symbols_counted) * 100);
+          ((float)_symbols_removed / (float)_symbols_counted) * 100);


Changed to double.

coleenp · 2023-08-03T00:06:49Z

src/hotspot/share/classfile/symbolTable.cpp

  tty->print_cr("  Total symbol length      " SIZE_FORMAT_W(7), hi.total_length);
  tty->print_cr("  Maximum symbol length    " SIZE_FORMAT_W(7), hi.max_length);
-  tty->print_cr("  Average symbol length    %7.2f", ((float)hi.total_length / hi.total_count));
+  tty->print_cr("  Average symbol length    %7.2f", ((float)hi.total_length / (float)hi.total_count));


Also changed to double.

src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp

src/hotspot/share/classfile/stringTable.cpp

src/hotspot/share/classfile/symbolTable.cpp

src/hotspot/cpu/x86/vm_version_x86.cpp

src/hotspot/share/classfile/classFileParser.cpp

src/hotspot/share/classfile/symbolTable.cpp

src/hotspot/share/classfile/stringTable.cpp

…in SymbolTable.

coleenp

I reverted the items_count change.

src/hotspot/cpu/x86/vm_version_x86.cpp

src/hotspot/share/classfile/classFileParser.cpp

src/hotspot/share/classfile/stringTable.cpp

src/hotspot/share/classfile/symbolTable.cpp

dholmes-ora

Okay on reverting the item_count changes - but we should look at a follow up RFE to get these types sorted out.

Thanks

src/hotspot/share/classfile/stringTable.cpp

dholmes-ora · 2023-08-04T05:15:59Z

src/hotspot/share/classfile/stringTable.cpp

      // refer to more than 16384 * 16384 = 26M interned strings! Not a practical concern
      // but bail out for safety.
-      log_error(cds)("Too many strings to be archived: %d", _items_count);
+      log_error(cds)("Too many strings to be archived: " SIZE_FORMAT, _items_count);


Ditto %zu?

dholmes-ora · 2023-08-04T05:16:46Z

src/hotspot/share/classfile/symbolTable.cpp

 size_t SymbolTable::estimate_size_for_archive() {
-  return CompactHashtableWriter::estimate_size(_items_count);
+  if (_items_count > (size_t)max_jint) {
+    fatal("Too many symbols to be archived: " SIZE_FORMAT, _items_count);


Ditto %zu?

coleenp · 2023-08-04T14:05:01Z

Okay on reverting the item_count changes - but we should look at a follow up RFE to get these types sorted out.

In this case, I think we need items_count to be size_t so that we can do an explicit bounds check for CDS, so this type is correct.

Thanks for reviewing, Matias, Dean and David.
/integrate

openjdk · 2023-08-04T14:06:19Z

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

e8a37b9: 8313248: C2: setScopedValueCache intrinsic exposes nullptr pre-values to store barriers
29f1d8e: 8313707: GHA: Bootstrap sysroots with --variant=minbase
61c58fd: 8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
5d23295: 8313251: Add NativeLibraryLoad event
c4b8574: 8311938: Add default cups include location for configure on AIX
10a2605: 8294979: test/jdk/tools/jlink 3 test classes use ASM library
e8c325d: 8313394: Array Elements in OldObjectSample event has the incorrect description
d60352e: 8311006: missing @SInCE info in jdk.xml.dom
4577147: 8313712: [BACKOUT] 8313632: ciEnv::dump_replay_data use fclose
bb3aac6: 8301606: JFileChooser file chooser details view "size" label cut off in Metal Look&Feel
... and 34 more: https://git.openjdk.org/jdk/compare/ee3e0917b393b879a543060ace2537be84f20e82...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-08-04T14:06:26Z

@coleenp Pushed as commit f66cd50.

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

coleenp added 9 commits August 1, 2023 12:35

Fix -Wconversion warnings in classfile code.

6ea354b

Fix vmIntrinsics.cpp

bfad5ce

Fix classLoader.cpp

830e836

Fix systemDictionaryShared.cpp

8bd60e8

Fix klassFactory.cpp

e73ea64

Fix fieldLayoutBuilder.cpp by fixing Contended command line parameter.

2d7b8ba

Fix loaderConstraints.cpp, altHashing.cpp, classLoaderExt.cpp

e488736

Fix compactHashtable.cpp

dd21775

unset Wconversion

3fa12be

openjdk bot added the rfr Pull request is ready for review label Aug 1, 2023

openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Aug 1, 2023

Missed a case that gets -Wconversion warning for ContendedPaddingWidt…

0e97905

…h. prefetch_data_size() returns uint, so added a checked_cast<> to catch the case where it would return greater than signed int max.

matias9927 reviewed Aug 2, 2023

View reviewed changes

coleenp commented Aug 2, 2023

View reviewed changes

matias9927 approved these changes Aug 2, 2023

View reviewed changes

dholmes-ora approved these changes Aug 2, 2023

View reviewed changes

src/hotspot/share/classfile/loaderConstraints.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/stringTable.cpp Show resolved Hide resolved

src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Aug 2, 2023

David's suggestions.

864a80f

coleenp commented Aug 3, 2023

View reviewed changes

Fix Atomic items_added code.

4019e4e

dholmes-ora suggested changes Aug 3, 2023

View reviewed changes

src/hotspot/share/classfile/stringTable.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/symbolTable.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/symbolTable.cpp Show resolved Hide resolved

openjdk bot removed the ready Pull request is ready to be integrated label Aug 3, 2023

dean-long reviewed Aug 3, 2023

View reviewed changes

src/hotspot/cpu/x86/vm_version_x86.cpp Show resolved Hide resolved

dean-long reviewed Aug 3, 2023

View reviewed changes

src/hotspot/share/classfile/classFileParser.cpp Show resolved Hide resolved

dean-long reviewed Aug 3, 2023

View reviewed changes

src/hotspot/share/classfile/symbolTable.cpp Outdated Show resolved Hide resolved

dean-long reviewed Aug 3, 2023

View reviewed changes

src/hotspot/share/classfile/stringTable.cpp Show resolved Hide resolved

Revert items_count change to int. Add check for items_count overflow …

a092d42

…in SymbolTable.

coleenp commented Aug 3, 2023

View reviewed changes

dholmes-ora approved these changes Aug 4, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 4, 2023

Add %zu

9cfa3f3

openjdk bot added the integrated Pull request has been integrated label Aug 4, 2023

openjdk bot closed this Aug 4, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 4, 2023

coleenp deleted the classfile-conversion branch August 4, 2023 14:06

Comments

Conversation

coleenp commented Aug 1, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Aug 1, 2023

Uh oh!

openjdk bot commented Aug 1, 2023

Uh oh!

mlbridge bot commented Aug 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

matias9927 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

coleenp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

matias9927 left a comment

Choose a reason for hiding this comment

Uh oh!

dholmes-ora left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openjdk bot commented Aug 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coleenp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coleenp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

coleenp commented Aug 1, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Aug 1, 2023 •

edited

Loading

matias9927 left a comment •

edited

Loading

openjdk bot commented Aug 2, 2023 •

edited

Loading