Skip to content

Conversation

@dlunde
Copy link
Member

@dlunde dlunde commented Nov 7, 2025

Issue Summary

The test compiler/cha/TypeProfileFinalMethod.java exercises a specific compilation pattern and easily breaks by setting various VM flags (e.g., -Xcomp).

Changeset

  • Make the test flagless.
  • Ensure the test only compiles the intended methods.
  • Fix problems with compiler directives used in the test (incorrect signatures and some directives getting unintentionally shadowed by other directives).
  • Force C2 inlining of a method which the test author likely intended to always be inlined (based on source code comments in the test).
  • Switch argument order in assertEquals to make error message correct.

Note for reviewers: A more fundamental rewrite of the test is beyond the scope of this changeset. The objective here is simply to ensure the test runs only in contexts intended by the test author.

Testing

  • GitHub Actions
  • tier1 and HotSpot parts of tier2 and tier3 (and additional Oracle-internal testing) on Windows x64, Linux x64, Linux aarch64, macOS x64, and macOS aarch64.
  • Stress testing of the specific test on Windows x64, Linux x64, Linux aarch64, macOS x64, and macOS aarch64.

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-8341039: compiler/cha/TypeProfileFinalMethod.java fails with assertEquals expected: 0 but was: 2 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28200

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 7, 2025

👋 Welcome back dlunden! 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 Nov 7, 2025

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

8341039: compiler/cha/TypeProfileFinalMethod.java fails with assertEquals expected: 0 but was: 2

Reviewed-by: rcastanedalo, dfenacci

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 194 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 changed the title 8341039 8341039: compiler/cha/TypeProfileFinalMethod.java fails with assertEquals expected: 0 but was: 2 Nov 7, 2025
@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 7, 2025
@openjdk
Copy link

openjdk bot commented Nov 7, 2025

@dlunde 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 rfr Pull request is ready for review label Nov 7, 2025
@mlbridge
Copy link

mlbridge bot commented Nov 7, 2025

Webrevs

Copy link
Contributor

@dafedafe dafedafe left a comment

Choose a reason for hiding this comment

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

Thanks for this "refactoring" @dlunde. LGTM (just 1 question)

@@ -25,7 +25,7 @@
/*
* @test
* @summary test c1 to record type profile with CHA optimization
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
* @requires vm.flavor == "server" & vm.flagless
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess this change is part of the "Make the test flagless" part (and TieredStopAtLevel filters seem anyway a bit odd) but did you figure out why this was added first? Was it possibly just a mistake (since we create a new process anyway)?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the review @dafedafe!

I guess this change is part of the "Make the test flagless" part (and TieredStopAtLevel filters seem anyway a bit odd) but did you figure out why this was added first?

I would guess the conditions for TieredStopAtLevel were added to ensure this particular flag could not break the test. However, there are many other flags that can also break the test. Hence, we need flagless (which subsumes the TieredStopAtLevel conditions).

Was it possibly just a mistake (since we create a new process anyway)?

The createTestJavaProcessBuilder method adds the default jvm options from jtreg, test.vm.opts and test.java.opts (see the source code comment for createTestJavaProcessBuilder). So no, not a mistake, but also not a complete safeguard.

Copy link
Contributor

@robcasloz robcasloz left a comment

Choose a reason for hiding this comment

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

Thanks for resurrecting this test, Daniel! The changes look good, I just have a minor suggestion (readding a useful comment that was removed in the changeset).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 12, 2025
Co-authored-by: Roberto Castañeda Lozano <robcasloz@users.noreply.github.com>
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 12, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 12, 2025
@dlunde
Copy link
Member Author

dlunde commented Nov 12, 2025

Thanks for the reviews @dafedafe and @robcasloz!

/integrate

@openjdk
Copy link

openjdk bot commented Nov 12, 2025

Going to push as commit 56a27d1.
Since your change was applied there have been 197 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 Nov 12, 2025
@openjdk openjdk bot closed this Nov 12, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 12, 2025
@openjdk
Copy link

openjdk bot commented Nov 12, 2025

@dlunde Pushed as commit 56a27d1.

💡 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