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

8254878: Move last piece of ZArray to GrowableArray #694

Closed
wants to merge 1 commit into from

Conversation

pliden
Copy link
Contributor

@pliden pliden commented Oct 16, 2020

ZArray used to be a separate implementation of a dynamically allocated/growable array. It now instead inherits from GrowableCHeapArray, and extends it with a transfer() function. I propose we rename this function to swap() and move it to GrowableArrayWithAllocator, since this function could be generally useful. It would also mean that ZArray could be just a typedef/using of GrowableCHeapArray.


Progress

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

Issue

  • JDK-8254878: Move last piece of ZArray to GrowableArray

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/694/head:pull/694
$ git checkout pull/694

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 16, 2020

👋 Welcome back pliden! 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 Pull request is ready for review label Oct 16, 2020
@openjdk
Copy link

openjdk bot commented Oct 16, 2020

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

  • hotspot

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 hotspot-dev@openjdk.org label Oct 16, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 16, 2020

Webrevs

@pliden
Copy link
Contributor Author

pliden commented Oct 17, 2020

/label add hotspot-gc

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Oct 17, 2020
@openjdk
Copy link

openjdk bot commented Oct 17, 2020

@pliden
The hotspot-gc label was successfully added.

@pliden pliden force-pushed the 8254878_growable_array branch from 1d9807c to 2667d7d Compare October 18, 2020 13:20
@pliden
Copy link
Contributor Author

pliden commented Oct 18, 2020

Rebased and updated a unit test.

@@ -687,7 +693,7 @@ class GrowableArrayCHeap : public GrowableArrayWithAllocator<E, GrowableArrayCHe
}

public:
GrowableArrayCHeap(int initial_max) :
GrowableArrayCHeap(int initial_max = 0) :
Copy link
Member

Choose a reason for hiding this comment

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

Just noting that GrowableArray defaults to 2 and here we default to 0.

Copy link
Contributor Author

@pliden pliden Oct 19, 2020

Choose a reason for hiding this comment

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

Thanks for reviewing. For a CHeap allocated array I think an initial_max of 0 makes more sense, since the cost of doing an allocation is typically higher, and lazily allocating the array means we will avoid the allocation cost all together in cases where an array was created but elements were never added.

@openjdk
Copy link

openjdk bot commented Oct 19, 2020

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

8254878: Move last piece of ZArray to GrowableArray

Reviewed-by: stefank, eosterlund

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

  • 294e070: 8254998: C2: assert(!n->as_Loop()->is_transformed_long_loop()) failure with -XX:StressLongCountedLoop=1
  • 3ee0380: 8234393: [macos] printing ignores printer tray
  • 3f9c8a3: 8254966: Remove unused code from Matcher
  • 21e67e5: 8225790: Two NestedDialogs tests fail on Ubuntu
  • 017d151: 8254842: [JVMCI] copy thread name when attaching libgraal thread to HotSpot
  • 5d1397f: 8254282: Add Linux x86_32 builds to submit workflow
  • 7ba6a6b: 8251158: Implementation of JEP 387: Elastic Metaspace
  • 5fedfa7: 8251271: C2: Compile::_for_igvn list is corrupted after RenumberLiveNodes
  • 98ec4a6: 8254805: compiler/debug/TestStressCM.java is still failing
  • 355f44d: 8254994: [x86] C1 StubAssembler::call_RT, "call_offset might not be initialized"
  • ... and 36 more: https://git.openjdk.java.net/jdk/compare/0b3e6c51bae47421d2fa3520b3eb6af22c668cc4...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 Oct 19, 2020
Copy link
Contributor

@fisk fisk left a comment

Choose a reason for hiding this comment

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

Looks good.

@pliden
Copy link
Contributor Author

pliden commented Oct 20, 2020

/integrate

@openjdk openjdk bot closed this Oct 20, 2020
@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 Oct 20, 2020
@openjdk
Copy link

openjdk bot commented Oct 20, 2020

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

  • 294e070: 8254998: C2: assert(!n->as_Loop()->is_transformed_long_loop()) failure with -XX:StressLongCountedLoop=1
  • 3ee0380: 8234393: [macos] printing ignores printer tray
  • 3f9c8a3: 8254966: Remove unused code from Matcher
  • 21e67e5: 8225790: Two NestedDialogs tests fail on Ubuntu
  • 017d151: 8254842: [JVMCI] copy thread name when attaching libgraal thread to HotSpot
  • 5d1397f: 8254282: Add Linux x86_32 builds to submit workflow
  • 7ba6a6b: 8251158: Implementation of JEP 387: Elastic Metaspace
  • 5fedfa7: 8251271: C2: Compile::_for_igvn list is corrupted after RenumberLiveNodes
  • 98ec4a6: 8254805: compiler/debug/TestStressCM.java is still failing
  • 355f44d: 8254994: [x86] C1 StubAssembler::call_RT, "call_offset might not be initialized"
  • ... and 36 more: https://git.openjdk.java.net/jdk/compare/0b3e6c51bae47421d2fa3520b3eb6af22c668cc4...master

Your commit was automatically rebased without conflicts.

Pushed as commit cdc8c40.

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

@pliden pliden deleted the 8254878_growable_array branch October 20, 2020 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants