8309692: Fix -Wconversion warnings in javaClasses by coleenp · Pull Request #14397 · openjdk/jdk

coleenp · 2023-06-09T16:00:51Z

Please review this trivial patch to remove implicit integer conversions in javaClasses.inline.hpp/cpp files.
Tested 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-8309692: Fix -Wconversion warnings in javaClasses (Enhancement - P4)

Reviewers

Frederic Parain (@fparain - Reviewer)
Matias Saavedra Silva (@matias9927 - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14397

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-06-09T16:01:38Z

👋 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-06-09T16:03:50Z

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

hotspot-runtime

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.

mlbridge · 2023-06-09T16:08:12Z

Webrevs

00: Full (30f5784c)

openjdk · 2023-06-09T17:42:01Z

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

8309692: Fix -Wconversion warnings in javaClasses

Reviewed-by: fparain, matsaave

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

cee5724: 8309727: Assert privileges while reading the jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK system property
7d6f97d: 8309673: Refactor ref_at methods in SA ConstantPool
7a970b2: 8309310: Update --release 21 symbol information for JDK 21 build 26
84184f9: 8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
679a6d8: 8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options
6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
c052756: 8282797: CompileCommand parsing errors should exit VM
dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
... and 80 more: https://git.openjdk.org/jdk/compare/98b53c06cfffe7b2e21968546b4aa1523f31132e...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 · 2023-06-09T19:06:04Z

Thanks Fred. I think you agree it's trivial?

matias9927

Looks good! Seems trivial as well

fparain · 2023-06-09T19:53:35Z

Yes, it is trivial.

coleenp · 2023-06-09T19:59:18Z

Thanks Fred and Matias!
/integrate

openjdk · 2023-06-09T20:03:50Z

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

7d82479: 8309142: Refactor test/langtools/tools/javac/versions/Versions.java
f5ec93e: 8309745: Problem list open client tests failing on Ubuntu_23.04
cee5724: 8309727: Assert privileges while reading the jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK system property
7d6f97d: 8309673: Refactor ref_at methods in SA ConstantPool
7a970b2: 8309310: Update --release 21 symbol information for JDK 21 build 26
84184f9: 8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
679a6d8: 8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options
6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
c052756: 8282797: CompileCommand parsing errors should exit VM
... and 82 more: https://git.openjdk.org/jdk/compare/98b53c06cfffe7b2e21968546b4aa1523f31132e...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-09T20:03:56Z

@coleenp Pushed as commit beec734.

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

dholmes-ora · 2023-06-12T08:11:43Z

src/hotspot/share/runtime/globals.hpp

          "(0.0 means off)")                                                \
          range(0.0, (double)max_intx)                                      \
                                                                            \
-  product(intx, MaxJavaStackTraceDepth, 1024,                               \


Seems unrelated to the described issue.

This accounted for 2 warnings in javaClasses.cpp.

kimbarrett · 2023-06-13T07:34:42Z

src/hotspot/share/classfile/javaClasses.inline.hpp

-  assert((jushort)bci == bci, "bci should be short");
-  return build_int_from_shorts(version, bci);
+  assert((u2)bci == bci, "bci should be short");
+  return build_int_from_shorts((u2)version, (u2)bci);


How about instead, something like

return build_int_from_shorts((u2)version, checked_cast<u2>(bci));

I guess that loses the explicit message, but seems otherwise clearer to me.

kimbarrett · 2023-06-13T07:36:30Z

src/hotspot/share/classfile/javaClasses.inline.hpp

-  return build_int_from_shorts(cpref, mid);
+  assert((u2)mid == mid, "mid should be short");
+  assert((u2)cpref == cpref, "cpref should be short");
+  return build_int_from_shorts((u2)cpref, (u2)mid);


Similarly here, could use

return build_int_from_shorts(checked_cast<u2>(cpref), checked_cast<u2>(mid));

kimbarrett · 2023-06-13T07:38:47Z

Oh well, I didn't notice this had already been integrated.

8309692: Fix -Wconversion warnings in javaClasses

30f5784

openjdk bot added the rfr Pull request is ready for review label Jun 9, 2023

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 9, 2023

fparain approved these changes Jun 9, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2023

matias9927 approved these changes Jun 9, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 9, 2023

openjdk bot closed this Jun 9, 2023

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

dholmes-ora reviewed Jun 12, 2023

View reviewed changes

coleenp deleted the javaclasses branch June 12, 2023 12:19

kimbarrett reviewed Jun 13, 2023

View reviewed changes

Conversation

coleenp commented Jun 9, 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 Jun 9, 2023

Uh oh!

openjdk bot commented Jun 9, 2023

Uh oh!

mlbridge bot commented Jun 9, 2023

Webrevs

Uh oh!

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

Uh oh!

Uh oh!

coleenp commented Jun 9, 2023

Uh oh!

matias9927 left a comment

Choose a reason for hiding this comment

Uh oh!

fparain commented Jun 9, 2023

Uh oh!

coleenp commented Jun 9, 2023

Uh oh!

openjdk bot commented Jun 9, 2023

Uh oh!

openjdk bot commented Jun 9, 2023

Uh oh!

dholmes-ora Jun 12, 2023

Choose a reason for hiding this comment

Uh oh!

coleenp Jun 12, 2023

Choose a reason for hiding this comment

Uh oh!

kimbarrett Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

kimbarrett Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

kimbarrett commented Jun 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

coleenp commented Jun 9, 2023 •

edited by openjdk bot

Loading

openjdk bot commented Jun 9, 2023 •

edited

Loading