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

8289427: compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java failed with null setting #9318

Closed
wants to merge 2 commits into from

Conversation

tkiriyama
Copy link
Contributor

@tkiriyama tkiriyama commented Jun 29, 2022

The problem of JDK-8289427 is caused by using incorrect compiler settings when the auto generated INTRINSIC parameter is null.
I fixed it to use the appropriate value if the argument of cmd was null.
Please review this change.


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-8289427: compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java failed with null setting

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9318

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 29, 2022

👋 Welcome back tkiriyama! 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 added the rfr Pull request is ready for review label Jun 29, 2022
@openjdk
Copy link

openjdk bot commented Jun 29, 2022

@tkiriyama 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 Jun 29, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 29, 2022

Webrevs

@TobiHartmann
Copy link
Member

Just wondering, what about the error reported in JDK-8225370 then?

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

The fix looks fine but I don't think you can remove the test from Problem list which references other not fixed bug.

@tkiriyama
Copy link
Contributor Author

I see. The error reported in JDK-8225370 didn't occur in my Win10 environment, but I don't know why didn't it. I restored ProblemList.txt.

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 to me.

@openjdk
Copy link

openjdk bot commented Jul 4, 2022

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

8289427: compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java failed with null setting

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

  • 688712f: 8289633: Forbid raw C-heap allocation functions in hotspot and fix findings
  • df063f7: 8289484: Cleanup unnecessary null comparison before instanceof check in java.rmi
  • 9ccae70: 8287593: ShortResponseBody could be made more resilient to rogue connections
  • bad9ffe: 8288947: G1: Consolidate per-region is-humongous query in G1CollectedHeap
  • b5d9656: 8288971: AArch64: Clean up stack and register handling in interpreter
  • d53b02e: 8287312: G1: Early return on first failure in VerifyRegionClosure
  • a8edd7a: 8289569: [test] java/lang/ProcessBuilder/Basic.java fails on Alpine/musl
  • e31003a: 8289575: G1: Remove unnecessary is-marking-active check in G1BarrierSetRuntime::write_ref_field_pre_entry
  • 8e7a3cb: 8289431: (zipfs) Avoid redundant HashMap.get in ZipFileSystemProvider.removeFileSystem
  • 649f2d8: 8065097: [macosx] javax/swing/Popup/TaskbarPositionTest.java fails because Popup is one pixel off
  • ... and 44 more: https://git.openjdk.org/jdk/compare/b96ba19807845739b36274efb168dd048db819a3...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 (@vnkozlov, @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 openjdk bot added the ready Pull request is ready to be integrated label Jul 4, 2022
@tkiriyama
Copy link
Contributor Author

Thank you for your reviews. I hope this fix integrated.

@tkiriyama
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 5, 2022
@openjdk
Copy link

openjdk bot commented Jul 5, 2022

@tkiriyama
Your change (at version 505529d) is now ready to be sponsored by a Committer.

@TobiHartmann
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 5, 2022

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

  • 688712f: 8289633: Forbid raw C-heap allocation functions in hotspot and fix findings
  • df063f7: 8289484: Cleanup unnecessary null comparison before instanceof check in java.rmi
  • 9ccae70: 8287593: ShortResponseBody could be made more resilient to rogue connections
  • bad9ffe: 8288947: G1: Consolidate per-region is-humongous query in G1CollectedHeap
  • b5d9656: 8288971: AArch64: Clean up stack and register handling in interpreter
  • d53b02e: 8287312: G1: Early return on first failure in VerifyRegionClosure
  • a8edd7a: 8289569: [test] java/lang/ProcessBuilder/Basic.java fails on Alpine/musl
  • e31003a: 8289575: G1: Remove unnecessary is-marking-active check in G1BarrierSetRuntime::write_ref_field_pre_entry
  • 8e7a3cb: 8289431: (zipfs) Avoid redundant HashMap.get in ZipFileSystemProvider.removeFileSystem
  • 649f2d8: 8065097: [macosx] javax/swing/Popup/TaskbarPositionTest.java fails because Popup is one pixel off
  • ... and 44 more: https://git.openjdk.org/jdk/compare/b96ba19807845739b36274efb168dd048db819a3...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 5, 2022

@TobiHartmann @tkiriyama Pushed as commit 1b997db.

💡 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
3 participants