Skip to content

8267112: JVMCI compiler modules should be kept upgradable #4014

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

Closed
wants to merge 2 commits into from

Conversation

vnkozlov
Copy link
Contributor

@vnkozlov vnkozlov commented May 13, 2021

JDK-8264806 changes removed sources and also removed JVMCI compiler from list of upgradable modules. JVMCI compiler modules should be upgradable in JDK to work with GraalVM.

Make these modules upgradable again and empty by leaving only reference to JVMCI (jdk.internal.vm.ci) module. It does not restore sources - only module-info.java files are kept.

Note, we continue discussion about JDK-8265091: "Use Module API to export JVMCI packages at runtime" to see if we can remove these module-info.java files.

Changes were proposed by @dougxc after testing JDK-8264806 changes with GraalVM.
I restored related code in some tests for them to pass.

Testing: full tier1-tier3.


Progress

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

Issue

  • JDK-8267112: JVMCI compiler modules should be kept upgradable

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4014

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 13, 2021

👋 Welcome back kvn! 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 May 13, 2021

@vnkozlov The following labels will be automatically applied to this pull request:

  • build
  • hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added build build-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels May 13, 2021
@dougxc
Copy link
Member

dougxc commented May 14, 2021

Looks good. My only suggestion would have been to avoid mentioning "Graal" in the PR title and description. This is really about making jdk.internal.vm.compiler a placeholder module for any JVMCI based compiler, of which Graal is one example.

@vnkozlov vnkozlov changed the title 8267112: Graal modules should be kept upgradable 8267112: JVMCI compiler modules should be kept upgradable May 14, 2021
@vnkozlov vnkozlov marked this pull request as ready for review May 14, 2021 17:44
@openjdk openjdk bot added the rfr Pull request is ready for review label May 14, 2021
@mlbridge
Copy link

mlbridge bot commented May 14, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented May 14, 2021

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

8267112: JVMCI compiler modules should be kept upgradable

Reviewed-by: mchung, erikj, dnsimon

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

  • da4dfde: 8264777: Overload optimized FileInputStream::readAllBytes
  • 3b11d81: 8266742: Check W^X state on possible safepoint
  • 79b3944: 8266520: Revert to OpenGL as the default 2D rendering pipeline for macOS
  • 3c010a7: 8265705: aarch64: KlassDecodeMovk mode broken
  • cf97252: 8264561: javap get NegativeArraySizeException on bad instruction
  • b8856b1: 8263614: javac allows local variables to be accessed from a static context
  • ea36836: 8267236: Versioned platform link in TestMemberSummary.java
  • d5a15f7: 8263438: Unused method AbstractMemberWriter.isInherited
  • dd5a84c: 8267162: Add jtreg test group definitions for langtools
  • 39a454b: 8260331: javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java failed with "ERROR: icon and imageIcon not same."
  • ... and 31 more: https://git.openjdk.java.net/jdk/compare/b4371e9bcaa1c8aa394b5eca409c5afc669cc146...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 May 14, 2021
@vnkozlov
Copy link
Contributor Author

Thank you, Mandy.

@vnkozlov
Copy link
Contributor Author

/reviewer credit @dougxc

@openjdk
Copy link

openjdk bot commented May 14, 2021

@vnkozlov
Reviewer dnsimon successfully credited.

@vnkozlov
Copy link
Contributor Author

@erikj79, are you okay with these changes?

@vnkozlov
Copy link
Contributor Author

Thank you, Erik.

@vnkozlov
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this May 17, 2021
@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 May 17, 2021
@openjdk
Copy link

openjdk bot commented May 17, 2021

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

  • da4dfde: 8264777: Overload optimized FileInputStream::readAllBytes
  • 3b11d81: 8266742: Check W^X state on possible safepoint
  • 79b3944: 8266520: Revert to OpenGL as the default 2D rendering pipeline for macOS
  • 3c010a7: 8265705: aarch64: KlassDecodeMovk mode broken
  • cf97252: 8264561: javap get NegativeArraySizeException on bad instruction
  • b8856b1: 8263614: javac allows local variables to be accessed from a static context
  • ea36836: 8267236: Versioned platform link in TestMemberSummary.java
  • d5a15f7: 8263438: Unused method AbstractMemberWriter.isInherited
  • dd5a84c: 8267162: Add jtreg test group definitions for langtools
  • 39a454b: 8260331: javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java failed with "ERROR: icon and imageIcon not same."
  • ... and 31 more: https://git.openjdk.java.net/jdk/compare/b4371e9bcaa1c8aa394b5eca409c5afc669cc146...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2effdd1.

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

@vnkozlov vnkozlov deleted the JDK-8267112 branch May 17, 2021 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants