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

8264759: x86_32 Minimal VM build failure after JDK-8262355 #3353

Closed

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Apr 6, 2021

* For target hotspot_variant-minimal_libjvm_objs_sharedRuntime_x86_32.o:
/home/shade/trunks/jdk/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp: In static member function 'static OopMap* RegisterSaver::save_live_registers(MacroAssembler*, int, int*, bool, bool)':
/home/shade/trunks/jdk/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp:234:22: error: 'opmask_state_bytes' was not declared in this scope
  234 |       __ subptr(rsp, opmask_state_bytes);
      |                      ^~~~~~~~~~~~~~~~~~

opmask_state_bytes is defined under COMPILER2 in the same method. Instead of protecting the block that uses opmask_state_bytes, I opted to protect the whole if (save_vectors) block, in the same way it is protected in the method prolog. The new assert checks the same thing as the assert in prolog.

Additional testing:

  • Linux x86_32 Minimal build
  • Linux x86_32 Server build

Progress

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

Issue

  • JDK-8264759: x86_32 Minimal VM build failure after JDK-8262355

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3353

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 6, 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 Apr 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 6, 2021

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good and trivial to me.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 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:

8264759: x86_32 Minimal VM build failure after JDK-8262355

Reviewed-by: thartmann, kvn

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 master branch:

  • 0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
  • 4bb80f3: 8262898: com/sun/net/httpserver/bugs/8199849/ParamTest.java times out
  • 2f51699: 8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias
  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt

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 Apr 6, 2021
Copy link
Contributor

@vnkozlov vnkozlov left a comment

Trivial.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Apr 6, 2021

Thanks! I realized that moving vzeroupper into COMPILER2 block was not quite right, as we "handle" only the save_vectors branch with that #ifdef. Reverted that part in new commit.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Good.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Apr 6, 2021

/integrate

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

@openjdk openjdk bot commented Apr 6, 2021

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

  • 0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
  • 4bb80f3: 8262898: com/sun/net/httpserver/bugs/8199849/ParamTest.java times out
  • 2f51699: 8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias
  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt

Your commit was automatically rebased without conflicts.

Pushed as commit a756d8d.

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