Skip to content

Conversation

@marc-chevalier
Copy link
Member

@marc-chevalier marc-chevalier commented Mar 26, 2025

Simply changing the path in @run was not enough (see JBS for details). And actually, the test wasn't doing anything before trying to open an output file to check the result. From various hints, I completed the test: I hope it was the intent!

I think @chhagedorn's eye would be the most relevant.

Thanks,
Marc


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-8352617: IR framework test TestCompileCommandFileWriter.java runs TestCompilePhaseCollector instead of itself (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24240

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2025

👋 Welcome back mchevalier! 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 Mar 26, 2025

@marc-chevalier 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:

8352617: IR framework test TestCompileCommandFileWriter.java runs TestCompilePhaseCollector instead of itself

Reviewed-by: chagedorn, 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 47 new commits pushed to the master branch:

  • 4100dc9: 8350801: Add a code signing hook to the JDK build system
  • 8a40498: 8352678: Opensource few JMenuItem tests
  • 66b5dba: 8350988: Consolidate Identity of self-inverse operations
  • 1007811: 8352897: RISC-V: Change default value for UseConservativeFence
  • 7853415: 8352218: RISC-V: Zvfh requires RVV
  • 2483340: 8352579: Refactor CDS legacy optimization for lambda proxy classes
  • 1397ee5: 8334322: Misleading values of keys in jpackage resource bundle
  • 441bd12: 8352812: remove useless class and function parameter in SuspendThread impl
  • e83cccf: 8352948: Remove leftover runtime_x86_32.cpp after 32-bit x86 removal
  • 5672a93: 8348400: GenShen: assert(ShenandoahHeap::heap()->is_full_gc_in_progress() || (used_regions_size() <= _max_capacity)) failed: Cannot use more than capacity #
  • ... and 37 more: https://git.openjdk.org/jdk/compare/bdcac98673a2250f608bdf244e17578eecb30fbe...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.

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 (@chhagedorn, @TobiHartmann) 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
Copy link

openjdk bot commented Mar 26, 2025

@marc-chevalier 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 Mar 26, 2025

private void check(Class<?> testClass, boolean findIdeal, boolean findOpto, CompilePhase... compilePhases) throws IOException {
var compilerDirectivesFlagBuilder = new CompilerDirectivesFlagBuilder(testClass);
compilerDirectivesFlagBuilder.build();
Copy link
Member Author

Choose a reason for hiding this comment

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

I was tempted to write

new CompilerDirectivesFlagBuilder(testClass).build();

since we don't use compilerDirectivesFlagBuilder after. But I felt like the style might not be liked. Opinions on that?

Copy link
Member

Choose a reason for hiding this comment

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

I guess it's fine to go with new CompilerDirectivesFlagBuilder(testClass).build().

Copy link
Member Author

Choose a reason for hiding this comment

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

If there is no strong preference, I'll just leave it as it is: having the variable doesn't hurt, as far as I know, and it helps slightly if one wants to debug, to make a breakpoint, to inspect the state of the object etc..

@marc-chevalier marc-chevalier marked this pull request as ready for review March 26, 2025 09:36
Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Good catch! I'm not sure why I removed this one line. It surely must have been exactly what you added now. Maybe I was doing some last experiments and somehow messed up to push it properly and then we missed it because it was actually not even run.


private void check(Class<?> testClass, boolean findIdeal, boolean findOpto, CompilePhase... compilePhases) throws IOException {
var compilerDirectivesFlagBuilder = new CompilerDirectivesFlagBuilder(testClass);
compilerDirectivesFlagBuilder.build();
Copy link
Member

Choose a reason for hiding this comment

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

I guess it's fine to go with new CompilerDirectivesFlagBuilder(testClass).build().

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 26, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 26, 2025

Webrevs

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Mar 27, 2025
@marc-chevalier
Copy link
Member Author

Fixed as requested. Also, vm.debug == true seems unnecessary.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 27, 2025
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.

@marc-chevalier
Copy link
Member Author

/integrate

Thanks @chhagedorn and @TobiHartmann !

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 27, 2025
@openjdk
Copy link

openjdk bot commented Mar 27, 2025

@marc-chevalier
Your change (at version 437a491) is now ready to be sponsored by a Committer.

@chhagedorn
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 27, 2025

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

  • 0bfa636: 8352426: RelocIterator should correctly handle nullptr address of relocation data
  • b7ffd22: 8352980: Purge infrastructure for FP-to-bits interpreter intrinsics after 32-bit x86 removal
  • 9a87e21: 8352800: [PPC] OpenJDK fails to build on PPC after JDK-8350106
  • 4100dc9: 8350801: Add a code signing hook to the JDK build system
  • 8a40498: 8352678: Opensource few JMenuItem tests
  • 66b5dba: 8350988: Consolidate Identity of self-inverse operations
  • 1007811: 8352897: RISC-V: Change default value for UseConservativeFence
  • 7853415: 8352218: RISC-V: Zvfh requires RVV
  • 2483340: 8352579: Refactor CDS legacy optimization for lambda proxy classes
  • 1397ee5: 8334322: Misleading values of keys in jpackage resource bundle
  • ... and 40 more: https://git.openjdk.org/jdk/compare/bdcac98673a2250f608bdf244e17578eecb30fbe...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 27, 2025
@openjdk openjdk bot closed this Mar 27, 2025
@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 Mar 27, 2025
@openjdk
Copy link

openjdk bot commented Mar 27, 2025

@chhagedorn @marc-chevalier Pushed as commit 927aeb2.

💡 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