8263380: Unintended use of Objects.nonNull in VarHandles

[cl4es]

Use requireNonNull instead.

---

Progress

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

Issue

• JDK-8263380: Unintended use of Objects.nonNull in VarHandles

Reviewers

• Roger Riggs (@RogerRiggs - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2914/head:pull/2914
$ git checkout pull/2914

[bridgekeeper]

👋 Welcome back redestad! 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]

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

• core-libs
• hotspot-compiler

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]

Webrevs

• 00: Full (36e866e)

[RogerRiggs]

Well spotted.

[JornVernee]

Nice catch!

We have a test that is supposed to test this: https://github.com/openjdk/jdk/blob/master/test/jdk/java/foreign/TestNulls.java But it is only checking if an NPE is thrown, and not checking for a message, since Objects::requireNonNull does not set an exception message. I guess that test was still passing because NPEs are thrown at some other point during the call.

[openjdk]

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

8263380: Unintended use of Objects.nonNull in VarHandles

Reviewed-by: rriggs

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:

• 4b5be40: 8238812: assert(false) failed: bad AD file
• b2a2ddf: 8262438: sun/security/ssl/SSLLogger/LoggingFormatConsistency.java failed with "SocketException: Socket is closed"
• c8c0234: 8262471: Fix coding style in src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
• 4d21a45: 8262913: KlassFactory::create_from_stream should never return NULL
• fab5676: 8247869: Change NONCOPYABLE to delete the operations
• c0542ed: 6251901: BasicTextUI: installDefaults method are contrary to the documentation

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.

[cl4es]

Nice catch!

We have a test that is supposed to test this: https://github.com/openjdk/jdk/blob/master/test/jdk/java/foreign/TestNulls.java But it is only checking if an NPE is thrown, and not checking for a message, since Objects::requireNonNull does not set an exception message. I guess that test was still passing because NPEs are thrown at some other point during the call.

Right, checked that passes (had only run the java/lang/invoke tests locally). An alternative approach here is to verify all methods already implicitly check null and remove all these, but being explicit is nice and reduces possibility of surprise.

[cl4es]

/integrate

[openjdk]

@cl4es Since your change was applied there have been 6 commits pushed to the master branch:

• 4b5be40: 8238812: assert(false) failed: bad AD file
• b2a2ddf: 8262438: sun/security/ssl/SSLLogger/LoggingFormatConsistency.java failed with "SocketException: Socket is closed"
• c8c0234: 8262471: Fix coding style in src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
• 4d21a45: 8262913: KlassFactory::create_from_stream should never return NULL
• fab5676: 8247869: Change NONCOPYABLE to delete the operations
• c0542ed: 6251901: BasicTextUI: installDefaults method are contrary to the documentation

Your commit was automatically rebased without conflicts.

Pushed as commit 7e52a6e.

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

[turbanoff]

I found few more similar places in JFR code, where Objects.nonNull is used incorrectly.

jdk.jfr.internal.consumer.AbstractEventStream#setStartTime
jdk.jfr.consumer.EventStream#openRepository(java.nio.file.Path)
jdk.jfr.Recording#setFlushInterval

[RogerRiggs]

Created an issue: JDK-8263395: Incorrect use of Objects.nonNull

I found few more similar places in JFR code, where Objects.nonNull is used incorrectly.

jdk.jfr.internal.consumer.AbstractEventStream#setStartTime
jdk.jfr.consumer.EventStream#openRepository(java.nio.file.Path)
jdk.jfr.Recording#setFlushInterval