-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8277878: Fix compiler tests after JDK-8275908 #6581
Conversation
👋 Welcome back simonis! A progress list of the required criteria for merging this PR into |
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.
That looks good and trivial to me.
@simonis 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 7 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
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! I guess it does not hurt to quickly verify it. Tier3 testing is submitted, will get back to you with the results.
Thanks @chhagedorn, @TobiHartmann! I'll wait with submitting until @chhagedorn reports back the Tier3 results. |
@simonis the submitted tests have passed. Thanks. |
/integrate |
Thanks @dholmes-ora. |
Going to push as commit 614c6e6.
Your commit was automatically rebased without conflicts. |
This is a quick fix for the two compiler tests introduced by JDK-8275908. The test explicitly added SerialGC in the parameter list which leads to a garbage collector conflict, if the tests are run with some other Garbage collector.
It was suggested to fix this by adding a
@requires vm.gc.Serial
tag but this is not necessary because the tests are actually GC-agnostic so I've removed the-XX:+UseSerialGC
parameter from the test command line instead.After the fix it was necessary to refine the check for whether the test JVM has JVMCI support built-in. Before the fix, I used
WhiteBox.getWhiteBox().isJVMCISupportedByGC()
which worked fine if only running with SerialGC. Now that we can run with GCs which don't support JVMCI we have to use the more specific(WB.getBooleanVMFlag("EnableJVMCI") != null)
.Please let me know if you want me to push this instantly after it has been reviewed or if you first want to re-run your internal Tier3 tests before pushing.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6581/head:pull/6581
$ git checkout pull/6581
Update a local copy of the PR:
$ git checkout pull/6581
$ git pull https://git.openjdk.java.net/jdk pull/6581/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 6581
View PR using the GUI difftool:
$ git pr show -t 6581
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6581.diff