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

8288601: Consolidate static/dynamic archive tables #9190

Conversation

iklam
Copy link
Member

@iklam iklam commented Jun 16, 2022

Please review this small clean-up of almost identical code that handles the tables for the static and dynamic archives.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8288601: Consolidate static/dynamic archive tables

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9190/head:pull/9190
$ git checkout pull/9190

Update a local copy of the PR:
$ git checkout pull/9190
$ git pull https://git.openjdk.org/jdk pull/9190/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9190

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9190.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 16, 2022

👋 Welcome back iklam! 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 Jun 16, 2022

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Jun 16, 2022
@iklam iklam marked this pull request as ready for review June 16, 2022 19:08
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 16, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 16, 2022

Webrevs

Comment on lines 27 to 28

#include "cds/archiveBuilder.hpp"
Copy link
Member

Choose a reason for hiding this comment

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

Only a blank line was added.

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Nice cleanup.
Has this changeset gone through any tier(s) testing?

@openjdk
Copy link

openjdk bot commented Jun 17, 2022

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

8288601: Consolidate static/dynamic archive tables

Reviewed-by: ccheung

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 30 new commits pushed to 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 Jun 17, 2022
@iklam
Copy link
Member Author

iklam commented Jun 18, 2022

Nice cleanup. Has this changeset gone through any tier(s) testing?

Hi Calvin,

Thanks for the review. This changeset has passed tiers 1-4. I also removed the blank line change you found.

@iklam
Copy link
Member Author

iklam commented Jun 21, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 21, 2022

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

  • 7e211d7: 8287672: jtreg test com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails intermittently in nightly run
  • 7039c66: Merge
  • 453e8be: 8288527: broken link in java.base/java/util/zip/package-summary.html
  • 33d0363: 8288741: JFR: Change package name of snippet files
  • 0408f9c: 8288663: JFR: Disabling the JfrThreadSampler commits only a partially disabled state
  • 1cf83a4: 8287800: JFR: Incorrect error message when starting recording with missing .jfc file
  • 09da87c: 8288485: jni/nullCaller/NullCallerTest.java failing (ppc64)
  • ed714af: 8288564: C2: LShiftLNode::Ideal produces wrong result after JDK-8278114
  • ae030bc: 8288397: AArch64: Fix register issues in SVE backend match rules
  • f12d044: 8288692: jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java fails after JDK-8288545
  • ... and 44 more: https://git.openjdk.org/jdk/compare/07612281b084de62b6fb9e682184f93316130f41...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 21, 2022
@openjdk openjdk bot closed this Jun 21, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 21, 2022
@openjdk
Copy link

openjdk bot commented Jun 21, 2022

@iklam Pushed as commit ad89146.

💡 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
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants