Skip to content

8333714: Cleanup the usages of CHECK_EXCEPTION_NULL_FAIL macro in java launcher #19576

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

Closed
wants to merge 3 commits into from

Conversation

jaikiran
Copy link
Member

@jaikiran jaikiran commented Jun 6, 2024

Can I please get a review for this change which proposes to remove the CHECK_EXCEPTION_NULL_FAIL macro from the java launcher code?

This addresses https://bugs.openjdk.org/browse/JDK-8333714. As noted in that JBS issue, in a recent PR discussion, it was suggested #18786 (comment) that this macro should be removed and the failure of a JNI specified operation (the ones for which this macro is being used) should be determined based on a NULL value returned from that function. The commit in this PR removes this macros and updates the call sites to do a NULL check.

Given the nature of this change, no new tests have been added. tier1, tier2 and tier3 testing passed successfully with these changes.


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-8333714: Cleanup the usages of CHECK_EXCEPTION_NULL_FAIL macro in java launcher (Task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19576

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 6, 2024

👋 Welcome back jpai! 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
Copy link

openjdk bot commented Jun 6, 2024

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

8333714: Cleanup the usages of CHECK_EXCEPTION_NULL_FAIL macro in java launcher

Reviewed-by: alanb

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

  • 9ed8629: 8333801: Typos in @code references of BufferedImage and JTableHeader
  • 0d3a377: 8333887: ubsan: unsafe.cpp:247:13: runtime error: store to null pointer of type 'volatile int'
  • 9d8439c: 8211854: [aix] java/net/ServerSocket/AcceptInheritHandle.java fails: read times out
  • f521367: 8211847: [aix] java/lang/ProcessHandle/InfoTest.java fails: "reported cputime less than expected"
  • f8c657f: 8334123: log the opening of Type 1 fonts
  • 57b6481: 8333277: ubsan: mlib_ImageScanPoly.c:292:43: runtime error: division by zero
  • 5528ad7: 8334179: VMATreeTest.TestConsistencyWithSimpleTracker_vm runs 50+ seconds
  • 5d2a19d: 8333684: C2 SuperWord: multiple smaller refactorings in preparation for JDK-8332163
  • 301bd70: 8311110: multichar warning in WinAccessBridge.cpp
  • 238162a: 8322064: Remove expired flags in JDK 24
  • ... and 84 more: https://git.openjdk.org/jdk/compare/1a50bd09ef7abfa3709edb388c7dbb003d483561...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.

@openjdk
Copy link

openjdk bot commented Jun 6, 2024

@jaikiran 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 Jun 6, 2024
@jaikiran jaikiran marked this pull request as ready for review June 6, 2024 13:06
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 6, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 6, 2024

Webrevs

@jaikiran
Copy link
Member Author

Any reviews for this please?

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

This looks okay, it makes these invokeXXX functions easier to read and avoids any confusion on return NULL vs. pending exception.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 13, 2024
@jaikiran
Copy link
Member Author

Thank you for the review Alan. I'll integrate this in a few hours.

@jaikiran
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 14, 2024

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

  • cc64aea: 8332400: isspace argument should be a valid unsigned char
  • 9b0a5c5: 8333248: VectorGatherMaskFoldingTest.java failed when maximum vector bits is 64
  • 6861766: 8332818: ubsan: archiveHeapLoader.cpp:70:27: runtime error: applying non-zero offset 18446744073707454464 to null pointer
  • b818679: 8293980: Resolve CONSTANT_FieldRef at CDS dump time
  • eb2488f: 8330198: Add some class loading related perf counters to measure VM startup
  • c4702ca: 8333827: JDK 23 RDP1 L10n resource files update
  • bb7ef03: 8333599: Improve description of \b matcher in j.u.r.Pattern
  • 0721dbe: 8334032: javax.print: Missing @SInCE tag in new class OutputBin
  • 6462b87: 8333685: Make update-copyright-year script more useful
  • b09a451: 8333840: C2 SuperWord: wrong result for MulAddS2I when inputs permuted
  • ... and 96 more: https://git.openjdk.org/jdk/compare/1a50bd09ef7abfa3709edb388c7dbb003d483561...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 14, 2024

@jaikiran Pushed as commit efab48c.

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

@jaikiran jaikiran deleted the 8333714 branch November 8, 2024 04:24
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
Development

Successfully merging this pull request may close these issues.

2 participants