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

8253824: Revert JDK-8253089 since VS warning C4307 has been disabled #426

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 30, 2020

This reverts commit 3f455f0.

Testing:

  • Linux x86_64 {fastdebug,release,slowdebug} builds
  • Windows MSVC 2017 build (tested by Martin Doerr)

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8253824: Revert JDK-8253089 since VS warning C4307 has been disabled

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/426/head:pull/426
$ git checkout pull/426

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2020

👋 Welcome back shade! 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.

@shipilev
Copy link
Member Author

@RealCLanger, @TheRealMDoerr: need your help to test Windows MSVC 2017 builds here. I (un)fortunately lost the build capability with MSVC 2017.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 30, 2020
@openjdk
Copy link

openjdk bot commented Sep 30, 2020

@shipilev The following label will be automatically applied to this pull request:

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Sep 30, 2020
@shipilev shipilev changed the title 8253824: Revert JDK-8253089 since VS warning has been disabled C4307 8253824: Revert JDK-8253089 since VS warning C4307 has been disabled Sep 30, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2020

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr 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 and builds with VS2017.

@openjdk
Copy link

openjdk bot commented Oct 1, 2020

@shipilev 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 more details.

After integration, the commit message for the final commit will be:

8253824: Revert JDK-8253089 since VS warning C4307 has been disabled

Reviewed-by: mdoerr, iklam

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 37 new commits pushed to the master branch:

  • 90c131f: 8224225: Tokenizer improvements
  • 9670425: 8253822: Remove unused exception_address_is_unpack_entry
  • 8440279: 8180514: TestPrintMdo.java test fails with -XX:-TieredCompilation
  • 44e6820: 8253650: Cleanup: remove alignment_hint parameter from os::reserve_memory
  • ed62b01: 6646602: Spelling error in javadoc for javax.swing.tree.TreeModel
  • 87276bc: 6690021: typos in TransferHandler Javadoc
  • dd36d8c: 8253429: Error reporting should report correct state of terminated/aborted threads
  • 2d9fa9d: 8247912: Make narrowOop a scoped enum
  • 928da49: 8253739: java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java fails
  • 3e96721: 8253727: [cgroups v2] Memory and swap limits reported incorrectly
  • ... and 27 more: https://git.openjdk.java.net/jdk/compare/4622a18a72c30c4fc72c166bee7de42903e1d036...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 1, 2020
@shipilev
Copy link
Member Author

shipilev commented Oct 1, 2020

Thanks for testing, @TheRealMDoerr! @iklam, want to take a look?

@shipilev
Copy link
Member Author

shipilev commented Oct 1, 2020

/integrate

@openjdk openjdk bot closed this Oct 1, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 1, 2020
@openjdk
Copy link

openjdk bot commented Oct 1, 2020

@shipilev Since your change was applied there have been 37 commits pushed to the master branch:

  • 90c131f: 8224225: Tokenizer improvements
  • 9670425: 8253822: Remove unused exception_address_is_unpack_entry
  • 8440279: 8180514: TestPrintMdo.java test fails with -XX:-TieredCompilation
  • 44e6820: 8253650: Cleanup: remove alignment_hint parameter from os::reserve_memory
  • ed62b01: 6646602: Spelling error in javadoc for javax.swing.tree.TreeModel
  • 87276bc: 6690021: typos in TransferHandler Javadoc
  • dd36d8c: 8253429: Error reporting should report correct state of terminated/aborted threads
  • 2d9fa9d: 8247912: Make narrowOop a scoped enum
  • 928da49: 8253739: java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java fails
  • 3e96721: 8253727: [cgroups v2] Memory and swap limits reported incorrectly
  • ... and 27 more: https://git.openjdk.java.net/jdk/compare/4622a18a72c30c4fc72c166bee7de42903e1d036...master

Your commit was automatically rebased without conflicts.

Pushed as commit 60ec2a5.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@shipilev shipilev deleted the JDK-8253824-revert-u2 branch October 5, 2020 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants