Skip to content

8307508: IndirectVarHandle.isAccessModeSupported throws NPE #14409

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

8307508: IndirectVarHandle.isAccessModeSupported throws NPE #14409

wants to merge 3 commits into from

Conversation

liach
Copy link
Member

@liach liach commented Jun 12, 2023 •
edited by openjdk bot
Loading

Fixes the NPE in IndirectVarHandle.isAccessModeSupported by delegating to the target var handle. In addition, simplified the MH caching in Indirect VH and removed redundant overrides (already available via var form). This was split from #13821 as suggested by Mandy Chung, which allows easy backports to release 21 if desirable.

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-8307508: IndirectVarHandle.isAccessModeSupported throws NPE (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14409

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 12, 2023

👋 Welcome back liach! 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 Jun 12, 2023
@openjdk
Copy link

openjdk bot commented Jun 12, 2023

@liach 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 12, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 12, 2023 •
edited
Loading

Webrevs

mlchung
mlchung approved these changes Jun 12, 2023
View reviewed changes
Copy link
Member

@mlchung mlchung left a comment

Choose a reason for hiding this comment

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

The fix looks good. Also nice clean up.

test/jdk/java/lang/invoke/VarHandles/IndirectVarHandleTest.java Outdated
public void testIsAccessModeTypeSupported() throws Throwable {
var lookup = MethodHandles.lookup();
var intArrayVh = MethodHandles.arrayElementVarHandle(int[].class);
var addOne = lookup.bind((IntUnaryOperator) a -> a + 1, "applyAsInt", MethodType.methodType(int.class, int.class));
Copy link
Member

Choose a reason for hiding this comment

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

Nit: a couple of long lines (L44, 48 and 55) can be wrapped into separate line.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done in a second push. Also wrapped the summary line (which was too long) from your suggestion patch.

Copy link
Member

Choose a reason for hiding this comment

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

Looks good. thanks.

@openjdk
Copy link

openjdk bot commented Jun 12, 2023 •
edited
Loading

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

8307508: IndirectVarHandle.isAccessModeSupported throws NPE

Reviewed-by: mchung

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 37 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@mlchung) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 12, 2023
@liach
Copy link
Member Author

liach commented Jun 13, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 13, 2023
@openjdk
Copy link

openjdk bot commented Jun 13, 2023

@liach
Your change (at version e471952) is now ready to be sponsored by a Committer.

@mlchung
Copy link
Member

mlchung commented Jun 13, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 13, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 13, 2023

@mlchung @liach Pushed as commit 75dcc4e.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mlchung mlchung mlchung approved these changes

Assignees
No one assigned
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@liach @mlchung