-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8352617: IR framework test TestCompileCommandFileWriter.java runs TestCompilePhaseCollector instead of itself #24240
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
Conversation
|
👋 Welcome back mchevalier! A progress list of the required criteria for merging this PR into |
|
@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: 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
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 |
|
@marc-chevalier The following label will be automatically applied to this pull request:
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. |
|
|
||
| private void check(Class<?> testClass, boolean findIdeal, boolean findOpto, CompilePhase... compilePhases) throws IOException { | ||
| var compilerDirectivesFlagBuilder = new CompilerDirectivesFlagBuilder(testClass); | ||
| compilerDirectivesFlagBuilder.build(); |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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().
There was a problem hiding this comment.
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..
There was a problem hiding this 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(); |
There was a problem hiding this comment.
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().
Webrevs
|
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompileCommandFileWriter.java
Show resolved
Hide resolved
|
Fixed as requested. Also, vm.debug == true seems unnecessary. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
|
/integrate Thanks @chhagedorn and @TobiHartmann ! |
|
@marc-chevalier |
|
/sponsor |
|
Going to push as commit 927aeb2.
Your commit was automatically rebased without conflicts. |
|
@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. |
Simply changing the path in
@runwas 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
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24240/head:pull/24240$ git checkout pull/24240Update a local copy of the PR:
$ git checkout pull/24240$ git pull https://git.openjdk.org/jdk.git pull/24240/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24240View PR using the GUI difftool:
$ git pr show -t 24240Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24240.diff
Using Webrev
Link to Webrev Comment