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

8256722: handle VC++:1927 VS2019 in abstract_vm_version #34

Closed
wants to merge 1 commit into from

Conversation

apavlyutkin
Copy link
Contributor

@apavlyutkin apavlyutkin commented Apr 8, 2022

Hi!

Here is the backport of 8256722 that extends the list recognizable VC++ compiler versions for VS2019. The patch from 11u applied cleanly except the path shuffling:

src/hotspot/share/runtime/abstract_vm_version.cpp -> hotspot/src/share/vm/runtime/vm_version.cpp


Progress

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

Issue

  • JDK-8256722: handle VC++:1927 VS2019 in abstract_vm_version

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/34/head:pull/34
$ git checkout pull/34

Update a local copy of the PR:
$ git checkout pull/34
$ git pull https://git.openjdk.org/jdk8u-dev pull/34/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 34

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/34.diff

Backport-of: e838d71d6151655980c8a96673f5db65f9168aee
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 8, 2022

👋 Welcome back apavlyutkin! 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 Apr 8, 2022

⚠️ @apavlyutkin could not find any commit with hash 146fe86ff68095b5eb0ce1387061699738280c06. Please update the title with the hash for an existing commit.

@openjdk openjdk bot changed the title Backport 146fe86ff68095b5eb0ce1387061699738280c06 8256722: handle VC++:1927 VS2019 in abstract_vm_version Apr 8, 2022
@openjdk
Copy link

openjdk bot commented Apr 8, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Apr 8, 2022
@apavlyutkin apavlyutkin changed the title 8256722: handle VC++:1927 VS2019 in abstract_vm_version Backport 146fe86ff68095b5eb0ce1387061699738280c06 Apr 8, 2022
@openjdk openjdk bot changed the title Backport 146fe86ff68095b5eb0ce1387061699738280c06 8256722: handle VC++:1927 VS2019 in abstract_vm_version Apr 8, 2022
@openjdk
Copy link

openjdk bot commented Apr 8, 2022

This backport pull request has now been updated with issue from the original commit.

@apavlyutkin
Copy link
Contributor Author

apavlyutkin commented Apr 8, 2022

/clean

@openjdk openjdk bot added the rfr label Apr 8, 2022
@openjdk
Copy link

openjdk bot commented Apr 8, 2022

@apavlyutkin Only OpenJDK Committers can use the /clean command

@yan-too
Copy link
Contributor

yan-too commented Apr 8, 2022

/clean

@openjdk openjdk bot added the clean label Apr 8, 2022
@openjdk
Copy link

openjdk bot commented Apr 8, 2022

@yan-too This backport pull request is now marked as clean

@mlbridge
Copy link

mlbridge bot commented Apr 8, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 8, 2022

@apavlyutkin This change now passes all automated pre-integration checks.

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

8256722: handle VC++:1927 VS2019 in  abstract_vm_version

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

  • 972112e: 8233019: java.lang.Class.isPrimitive() (C1) returns wrong result if Klass* is aligned to 32bit
  • e005185: 8235218: Minimal VM is broken after JDK-8173361
  • eeef4de: 8150669: C1 intrinsic for Class.isPrimitive
  • 6e8292f: 8283849: AsyncGetCallTrace may crash JVM on guarantee
  • ce73401: 8136354: [TEST_BUG] Test java/awt/image/RescaleOp/RescaleAlphaTest.java with Bad action for script
  • a3c0ed2: 8087283: Add support for the XML Signature here() function to the JDK XPath implementation
  • 1b4f32d: 8173361: various crashes in JvmtiExport::post_compiled_method_load
  • cf6b628: 8260589: Crash in JfrTraceIdLoadBarrier::load(_jclass*)
  • 83e9095: 8280963: Incorrect PrintFlags formatting on Windows
  • 820ab13: 8235385: Crash on aarch64 JDK due to long offset
  • ... and 51 more: https://git.openjdk.org/jdk8u-dev/compare/e403fd517ae3d76ec75ba3409c4478e467d8aa12...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.

➡️ 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 label Apr 8, 2022
@bridgekeeper
Copy link

bridgekeeper bot commented May 6, 2022

@apavlyutkin This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jerboaa
Copy link
Contributor

jerboaa commented Jul 8, 2022

/open

@openjdk
Copy link

openjdk bot commented Jul 8, 2022

@jerboaa Only the pull request author can set the pull request state to "open"

@jerboaa
Copy link
Contributor

jerboaa commented Jul 8, 2022

I've approved this, feel free to re-open and integrate.

@apavlyutkin apavlyutkin reopened this Jul 11, 2022
@apavlyutkin
Copy link
Contributor Author

apavlyutkin commented Jul 11, 2022

/integrate

@openjdk openjdk bot added the sponsor label Jul 11, 2022
@openjdk
Copy link

openjdk bot commented Jul 11, 2022

@apavlyutkin
Your change (at version bcf01a3) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Contributor

yan-too commented Jul 11, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 11, 2022

Going to push as commit 4f7dd0c.
Since your change was applied there have been 61 commits pushed to the master branch:

  • 972112e: 8233019: java.lang.Class.isPrimitive() (C1) returns wrong result if Klass* is aligned to 32bit
  • e005185: 8235218: Minimal VM is broken after JDK-8173361
  • eeef4de: 8150669: C1 intrinsic for Class.isPrimitive
  • 6e8292f: 8283849: AsyncGetCallTrace may crash JVM on guarantee
  • ce73401: 8136354: [TEST_BUG] Test java/awt/image/RescaleOp/RescaleAlphaTest.java with Bad action for script
  • a3c0ed2: 8087283: Add support for the XML Signature here() function to the JDK XPath implementation
  • 1b4f32d: 8173361: various crashes in JvmtiExport::post_compiled_method_load
  • cf6b628: 8260589: Crash in JfrTraceIdLoadBarrier::load(_jclass*)
  • 83e9095: 8280963: Incorrect PrintFlags formatting on Windows
  • 820ab13: 8235385: Crash on aarch64 JDK due to long offset
  • ... and 51 more: https://git.openjdk.org/jdk8u-dev/compare/e403fd517ae3d76ec75ba3409c4478e467d8aa12...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jul 11, 2022
@openjdk openjdk bot closed this Jul 11, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Jul 11, 2022
@openjdk
Copy link

openjdk bot commented Jul 11, 2022

@yan-too @apavlyutkin Pushed as commit 4f7dd0c.

💡 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
backport clean integrated
3 participants