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

8270453: [JVMCI] remove duplicates in vmStructs_jvmci.cpp #4779

Closed
wants to merge 1 commit into from

Conversation

dougxc
Copy link
Member

@dougxc dougxc commented Jul 14, 2021

Removes some duplicate exports in vmStructs_jvmci.cpp.

I've tested by comparing the output of java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+EagerJVMCI -Djvmci.PrintConfig=true -version before and after this change.


Progress

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

Issue

  • JDK-8270453: [JVMCI] remove duplicates in vmStructs_jvmci.cpp

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4779

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

Using diff file

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

@@ -496,13 +496,6 @@
declare_constant(vmIntrinsics::_invokeGeneric) \
declare_constant(vmIntrinsics::_compiledLambdaForm) \
\
declare_constant(CollectedHeap::Serial) \
Copy link
Member Author

Choose a reason for hiding this comment

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

The duplicated declarations start on line 487.

@dougxc dougxc marked this pull request as ready for review July 14, 2021 12:17
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 14, 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.

@openjdk
Copy link

openjdk bot commented Jul 14, 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.

@openjdk openjdk bot added hotspot-compiler hotspot-compiler-dev@openjdk.org rfr Pull request is ready for review labels Jul 14, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 14, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good and trivial.

Duplicates were added by
8257020: [JVMCI] enable a JVMCICompiler to specify which GCs it supports

@openjdk
Copy link

openjdk bot commented Jul 14, 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:

8270453: [JVMCI] remove duplicates in vmStructs_jvmci.cpp

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

  • c0d4eff: 6506405: Math.abs(float) is slow

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 Pull request is ready to be integrated label Jul 14, 2021
@dougxc
Copy link
Member Author

dougxc commented Jul 14, 2021

Thanks for the review @vnkozlov .

@dougxc
Copy link
Member Author

dougxc commented Jul 14, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jul 14, 2021

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

  • fb86d13: 8270100: Fix some inaccurate GC logging
  • b1bb05b: 8269592: [JVMCI] Optimize c2v_iterateFrames
  • c0d4eff: 6506405: Math.abs(float) is slow

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 14, 2021

@dougxc Pushed as commit 14da658.

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

@dougxc dougxc deleted the JDK-8270453 branch August 23, 2022 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
2 participants