Skip to content
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

8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java #339

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Mar 7, 2024

Fixes the test when running with C1. Does not apply cleanly, because the relevant problemlist change is not applicable to jdk21u. We backported JDK-8314838 to 21.0.3, which exposes us to this bug.

Additional testing:

  • MacOS AArch64 server fastdebug, C1, affected test fails without the patch, skipped with it
  • MacOS AArch64 server fastdebug, C2, affected test passes with the patch

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
  • JDK-8318455 needs maintainer approval

Issue

  • JDK-8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/339/head:pull/339
$ git checkout pull/339

Update a local copy of the PR:
$ git checkout pull/339
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/339/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 339

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/339.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 2024

👋 Welcome back shade! 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 changed the title Backport 4a16d111b16e556f904fb80075631b8439a9482e 8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java Mar 7, 2024
@openjdk
Copy link

openjdk bot commented Mar 7, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 7, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 7, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 7, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@shipilev
Copy link
Member Author

shipilev commented Mar 8, 2024

/approval request Fixes the test when running with C1. Does not apply cleanly, because the relevant problemlist change is not applicable to jdk21u. Risk is low, test-only fix.

@openjdk
Copy link

openjdk bot commented Mar 8, 2024

@shipilev
8318455: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Mar 8, 2024
@openjdk
Copy link

openjdk bot commented Mar 11, 2024

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

8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java

Reviewed-by: phh

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

  • 624e603: 8315834: Open source several Swing JSpinner related tests
  • 066af44: 8325137: com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java can fail in Xcomp with out of expected range
  • 8e439ba: 8317287: [macos14] InterJVMGetDropSuccessTest.java: Child VM: abnormal termination
  • 9a8d91a: 8315677: Open source few swing JFileChooser and other tests
  • c4c4b22: 8325326: [PPC64] Don't relocate in case of allocation failure
  • c26cad3: 8278527: java/util/concurrent/tck/JSR166TestCase.java fails nanoTime test
  • 315d051: 8314828: Mark 3 jcmd command-line options test as vm.flagless
  • ab6e027: 8320712: Rewrite BadFactoryTest in pure Java
  • 40f0254: 8323276: StressDirListings.java fails on AIX
  • d4823c2: 8322477: order of subclasses in the permits clause can differ between compilations
  • ... and 17 more: https://git.openjdk.org/jdk21u-dev/compare/2d62854922ea6fd3a948af64bd0f263db7dd6aa3...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 openjdk bot added ready Pull request is ready to be integrated and removed approval labels Mar 11, 2024
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 11, 2024

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

  • c0b5fdf: 8326140: src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp ReleaseStringChars might be missing in early returns
  • 50f447c: 8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate
  • 3086ed8: 8324834: Use _LARGE_FILES on AIX
  • 83cc4cb: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • 624e603: 8315834: Open source several Swing JSpinner related tests
  • 066af44: 8325137: com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java can fail in Xcomp with out of expected range
  • 8e439ba: 8317287: [macos14] InterJVMGetDropSuccessTest.java: Child VM: abnormal termination
  • 9a8d91a: 8315677: Open source few swing JFileChooser and other tests
  • c4c4b22: 8325326: [PPC64] Don't relocate in case of allocation failure
  • c26cad3: 8278527: java/util/concurrent/tck/JSR166TestCase.java fails nanoTime test
  • ... and 21 more: https://git.openjdk.org/jdk21u-dev/compare/2d62854922ea6fd3a948af64bd0f263db7dd6aa3...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 11, 2024

@shipilev Pushed as commit a75d19d.

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

@shipilev shipilev deleted the JDK-8318455-sharedtrampolinetest branch April 24, 2024 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants