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

8267338: [JVMCI] revive JVMCI API removed by JDK-8243287 #4099

Closed
wants to merge 3 commits into from

Conversation

@dougxc
Copy link
Member

@dougxc dougxc commented May 18, 2021

This PR revives ResolvedJavaType.getHostClass to preserve JVMCI compatibility. The revived method just returns null.


Progress

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

Issue

  • JDK-8267338: [JVMCI] revive JVMCI API removed by JDK-8243287

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4099

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 18, 2021

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

Loading

@openjdk openjdk bot added the rfr label May 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 18, 2021

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

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 18, 2021

Webrevs

Loading

* Returns {@code null} since support for VM anonymous class was removed by JDK-8243287.
* This method is preserved for JVMCI backwards compatibility.
*/
default ResolvedJavaType getHostClass() {
Copy link
Member

@christianwimmer christianwimmer May 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mark the method as deprecated?

Loading

Copy link
Member

@mlchung mlchung left a comment

I missed this in my review. Thanks for adding it back.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 18, 2021

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

8267338: [JVMCI] revive JVMCI API removed by JDK-8243287

Reviewed-by: mchung, hseigel

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

  • e749f75: 8267304: Bump global JTReg memory limit to 768m
  • e858dd6: 8267361: JavaTokenizer reads octal numbers mistakenly
  • 1b93b81: 8267133: jdk/jfr/event/gc/collection/TestG1ParallelPhases.java fails with Not expected phases: RestorePreservedMarks, RemoveSelfForwardingPtr: expected true, was false
  • 88b1142: 8267357: build breaks with -Werror option on micro benchmark added for JDK-8256973
  • 6ef46ce: 8231672: Simplify the reference processing parallelization framework
  • 392f962: 8267151: C2: Don't create dummy Opaque1Node for outmost unswitched IfNode
  • 0cf7e57: 8267239: C1: RangeCheckElimination for % operator if divisor is IntConstant
  • 2d407e1: 8267293: vmTestbase/vm/mlvm/anonloader/stress/oome/metaspace/Test.java fails when JTREG_JOBS > 25
  • 70f6c67: 8233380: CHT: Node allocation and freeing
  • 2563a6a: 8266962: Add arch supporting check for "Op_VectorLoadConst" before creating the node
  • ... and 12 more: https://git.openjdk.java.net/jdk/compare/fadf58043c10e4fd98dfdb35256f5efc6d3cd366...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.

Loading

@openjdk openjdk bot added the ready label May 18, 2021
@vnkozlov
Copy link
Contributor

@vnkozlov vnkozlov commented May 18, 2021

It seems the fix is incomplete - next test is failing: compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java

Loading

Copy link
Member

@hseigel hseigel left a comment

LGTM
Thanks, Harold

Loading

@dougxc
Copy link
Member Author

@dougxc dougxc commented May 19, 2021

/integrate

Loading

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

@openjdk openjdk bot commented May 19, 2021

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

  • 0b49f5a: 8267257: Shenandoah: Always deduplicate strings when it is enabled during full gc
  • 12050f0: 8266651: Convert Table method parameters from String to Content
  • e749f75: 8267304: Bump global JTReg memory limit to 768m
  • e858dd6: 8267361: JavaTokenizer reads octal numbers mistakenly
  • 1b93b81: 8267133: jdk/jfr/event/gc/collection/TestG1ParallelPhases.java fails with Not expected phases: RestorePreservedMarks, RemoveSelfForwardingPtr: expected true, was false
  • 88b1142: 8267357: build breaks with -Werror option on micro benchmark added for JDK-8256973
  • 6ef46ce: 8231672: Simplify the reference processing parallelization framework
  • 392f962: 8267151: C2: Don't create dummy Opaque1Node for outmost unswitched IfNode
  • 0cf7e57: 8267239: C1: RangeCheckElimination for % operator if divisor is IntConstant
  • 2d407e1: 8267293: vmTestbase/vm/mlvm/anonloader/stress/oome/metaspace/Test.java fails when JTREG_JOBS > 25
  • ... and 14 more: https://git.openjdk.java.net/jdk/compare/fadf58043c10e4fd98dfdb35256f5efc6d3cd366...master

Your commit was automatically rebased without conflicts.

Pushed as commit fdd0352.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants