Skip to content

Conversation

@bulasevich
Copy link
Contributor

@bulasevich bulasevich commented Jan 5, 2024

Test checks for the ADRP instruction in the [Exception Handler] section of the TestFarJump::main PrintAssembly output.

The -XX:CompileOnly=TestFarJump::main option is not sufficient to restrict PrintAssembly output to a specific method. A number of method assemblies precede the output of the TestFarJump::main method:

  • java.lang.invoke.MethodHandle::linkToStatic(LLLLLLL)L
  • java.lang.invoke.MethodHandle::linkToStatic(LLLL)V
  • java.lang.invoke.MethodHandle::invokeBasic(LLLLLL)L
  • java.lang.invoke.MethodHandle::linkToSpecial(LLLLLLLL)L
  • java.lang.invoke.MethodHandle::linkToSpecial(LLLLL)V
  • java.lang.invoke.MethodHandle::invokeBasic(LLL)L
  • java.lang.invoke.MethodHandle::linkToSpecial(LLLLL)L
  • java.lang.invoke.MethodHandle::linkToStatic(LL)L
  • java.lang.invoke.MethodHandle::linkToSpecial(LL)V
  • java.lang.invoke.MethodHandle::invokeBasic()L
  • java.lang.invoke.MethodHandle::linkToSpecial(LL)L
  • java.lang.invoke.MethodHandle::linkToStatic(LLL)L
  • java.lang.invoke.MethodHandle::linkToStatic(LLLL)L
  • java.lang.invoke.MethodHandle::linkToSpecial(LLL)V
  • java.lang.invoke.MethodHandle::invokeBasic(L)L
  • java.lang.invoke.MethodHandle::linkToSpecial(LLL)L
  • java.lang.invoke.MethodHandle::linkToStatic(LLL)V
  • java.lang.invoke.MethodHandle::linkToStatic(LL)I
  • jdk.internal.vm.Continuation::enterSpecial
  • compiler.c2.aarch64.TestFarJump::main

With this change, I use the -XX:CompileCommand=option,TestFarJump::main,bool,PrintAssembly,true option to restrict the PrintAssembly output to a specific method. Now the only [Exception Handler] in the listing is the section of TestFarJump::main method.


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-8322858: compiler/c2/aarch64/TestFarJump.java fails on AArch64 due to unexpected PrintAssembly output (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17278

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 5, 2024

👋 Welcome back bulasevich! 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 Jan 5, 2024
@openjdk
Copy link

openjdk bot commented Jan 5, 2024

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

  • hotspot-compiler

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 hotspot-compiler hotspot-compiler-dev@openjdk.org label Jan 5, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 5, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 5, 2024

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

8322858: compiler/c2/aarch64/TestFarJump.java fails on AArch64 due to unexpected PrintAssembly output

Reviewed-by: aph, thartmann

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 78 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 ready Pull request is ready to be integrated label Jan 5, 2024
Copy link
Member

@TobiHartmann TobiHartmann 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 to me too.

@bulasevich
Copy link
Contributor Author

Tobias and Andrew, thank you!

@bulasevich
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

Going to push as commit 52a6c37.
Since your change was applied there have been 78 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 Jan 9, 2024
@openjdk openjdk bot closed this Jan 9, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 9, 2024
@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@bulasevich Pushed as commit 52a6c37.

💡 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

Labels

hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants