Skip to content

8354323: Safeguard SwitchBootstraps.typeSwitch when used outside the compiler #25090

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

biboudis
Copy link
Member

@biboudis biboudis commented May 7, 2025

While the compiler does not allow invalid queries to flow into SwitchBootstraps:typeSwitch, a library user could do that and typeSwitch does not prevent such usage pattern errors resulting in erroneous evaluation.

For example this is not valid Java (and protected) by javac:

byte b = 1;
switch (b) {
    case String s -> System.out.println("How did we get here? byte is " + s.getClass());
}

but this is a valid call (and not protected):

CallSite shortSwitch = SwitchBootstraps.typeSwitch(
    MethodHandles.lookup(), 
    "", 
    MethodType.methodType(int.class, short.class, int.class),  // models (short, int) -> int
    String.class);

The SwitchBootstraps.typeSwitch returns wrong result since the code was reasoning erroneously that this pair was unconditionally exact.

This PR proposes to add the safety check in unconditional exactness which will return false in erroneous pairs and then the actual check will be delegated to instanceof. For the case of erroneous pairs with primitive booleans there is a check in the beginning of the type switch skeleton.


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-8354323: Safeguard SwitchBootstraps.typeSwitch when used outside the compiler (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25090

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 7, 2025

👋 Welcome back abimpoudis! 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 May 7, 2025

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

8354323: Safeguard SwitchBootstraps.typeSwitch when used outside the compiler

Reviewed-by: liach

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:

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 openjdk bot added the rfr Pull request is ready for review label May 7, 2025
@openjdk
Copy link

openjdk bot commented May 7, 2025

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

@mlbridge
Copy link

mlbridge bot commented May 7, 2025

Webrevs

cb.goto_(next);
continue;
}
else if (unconditionalExactnessCheck(selectorType, classLabel)) {
Copy link
Member

Choose a reason for hiding this comment

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

Can we merge this into isNotValidPair(...) || unconditionalExactnessCheck(...) then do nothing? The next label is already in theory immediately bound to the instruction after goto.

Copy link
Member Author

Choose a reason for hiding this comment

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

The empty body means that we unconditionally return the index case 0 -> /*no if is generated*/ return 0;.

I confirmed that by merging, the following test would not pass. It returns erroneously 0, instead of 1.

testPrimitiveType((byte) 1, byte.class,0, 1, boolean.class, byte.class);

Copy link
Member

@liach liach left a comment

Choose a reason for hiding this comment

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

looks good!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs [email protected] ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

2 participants