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

8269138: Move typeArrayOop.inline.hpp include to vectorSupport.cpp #4559

Closed

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Jun 22, 2021

See the bug report for inclusion circularity that breaks current Loom workspace. Including stuff properly, .hpp in .hpp, and .inline.hpp in .cpp resolves this.

Additional testing:

  • Linux x86_64 builds
  • Loom repository builds Linux x86_64 with this patch cherry-picked

Progress

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

Issue

  • JDK-8269138: Move typeArrayOop.inline.hpp include to vectorSupport.cpp

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4559/head:pull/4559
$ git checkout pull/4559

Update a local copy of the PR:
$ git checkout pull/4559
$ git pull https://git.openjdk.java.net/jdk pull/4559/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4559

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4559.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 22, 2021

👋 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.

@openjdk openjdk bot added the rfr label Jun 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2021

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

  • hotspot

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 label Jun 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 22, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2021

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

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

8269138: Move typeArrayOop.inline.hpp include to vectorSupport.cpp

Reviewed-by: stefank, vlivanov

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 1 new commit pushed to the master branch:

  • 18a1dd2: 8269031: linux x86_64 check for binutils 2.25 or higher after 8265783

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 label Jun 22, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jun 22, 2021

Thank you. Trivial?

@stefank
Copy link
Member

@stefank stefank commented Jun 22, 2021

Yes, trivial.

Copy link

@iwanowww iwanowww left a comment

Looks good and trivial.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jun 23, 2021

There are GHA failures on Linux additional builds. I believe these are due to JDK-8269148. Since that fix would go through jdk17 -> jdk sync much later, I would not wait for it here. I'll integrate this simple fix now.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 23, 2021

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

  • 36d82b6: 8268858: Determine register pressure automatically by the number of available registers for allocation
  • ae3eedc: 8268727: Remove unused slowpath locking method in OptoRuntime
  • cd678a3: 8268368: Adopt cast notation for JavaThread conversions
  • b6cfca8: Merge
  • 35e4c27: 8268404: [TESTBUG] tools/jpackage/windows/WinInstallerIconTest.java failed "AssertionError: Failed: Check icon"
  • dc12cb7: 8267652: c2 loop unrolling by 8 results in reading memory past array
  • 578c55b: 8267399: C2: java/text/Normalizer/ConformanceTest.java test failed with assertion
  • 8fa2520: 8268888: Upstream 8268230: Foreign Linker API & Windows user32/kernel32: String conversion seems broken
  • 9ec7180: 8268524: nmethod::post_compiled_method_load_event racingly called on zombie
  • 01f12fb: 8266631: StandardJavaFileManager: getJavaFileObjects() impl violates the spec
  • ... and 7 more: https://git.openjdk.java.net/jdk/compare/2e639dd34a4342de6e1b9470448d66ef89c4bd52...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 23, 2021

@shipilev Pushed as commit 17daf32.

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

@shipilev shipilev deleted the JDK-8269138-demote-typearray branch Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants