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

Merge master #47

Merged
merged 77 commits into from
Sep 18, 2020
Merged

Merge master #47

merged 77 commits into from
Sep 18, 2020

Conversation

openjdk-bot
Copy link

@openjdk-bot openjdk-bot commented Sep 17, 2020

Hi all,

this is an automatically generated pull request to notify you that there are 76 commits from the branch masterthat can not be merged into the branch records-2:

The following file contains merge conflicts:

  • .jcheck/conf

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/amber repository.

# Ensure target branch is up to date
$ git checkout records-2
$ git pull https://github.com/openjdk/amber records-2

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +63:openjdk-bot-63
$ git checkout openjdk-bot-63

# Merge the target branch
$ git merge records-2

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge master'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/amber openjdk-bot-63:63

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/amber pull/47/head:pull/47
$ git checkout pull/47

David Holmes and others added 30 commits September 11, 2020 01:31
Reviewed-by: shade, coleenp, kbarrett, dcubed
Reviewed-by: dholmes, coleenp, gziemski
Remove dead definition of ptr_type in TypeAryPtr::cast_to_autobox_cache. Also remove
unnecessary cache parameter (always true) for simplicity.

Reviewed-by: shade, vlivanov, thartmann
Remove unused Matcher::stack_direction() together with related ADL entries and
ADLC support.

Reviewed-by: vlivanov, thartmann
…247281

Co-authored-by: Erik Österlund <erik.osterlund@oracle.com>
Co-authored-by: Daniel Daugherty <daniel.daugherty@oracle.com>
Reviewed-by: rehn, coleenp, eosterlund
Reviewed-by: darcy, lancea
Reviewed-by: erikj, coleenp, lfoltan, redestad, alanb, mchung
Reviewed-by: kbarrett, stefank, eosterlund
…s that require type inference

Reviewed-by: vromero
…nnot be mapped

Reviewed-by: ccheung, dholmes
8238956: Replace powerOfTwo::max_value with std::numeric_limits

Reviewed-by: tschatzl, stefank
Change lognot => logical_not in comment

Reviewed-by: shade
… reserve can result in repeated full gcs

Reviewed-by: sjohanss, kbarrett
Reimpliment PrimitiveConversions::cast, with some cases now constexpr.
<!-- Anything below this marker will be automatically updated, please do not edit manually! -->
---------
### Progress
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] Change must be properly reviewed

### Issue
* [JDK-8247909](https://bugs.openjdk.java.net/browse/JDK-8247909): Improve PrimitiveConversions::cast using C++14


### Download
`$ git fetch https://git.openjdk.java.net/jdk pull/143/head:pull/143`
`$ git checkout pull/143`

Reviewed-by: dholmes, stefank
…space

8158045: Improve large object handling during evacuation
8027761: Investigate fast-path for scanning only objects with references during gc

Generate multiple partial array tasks for large objArrays.

Reviewed-by: sjohanss, ayang, tschatzl
iklam and others added 16 commits September 16, 2020 22:43
…mes in calculation

Reviewed-by: tschatzl, kbarrett
…too fast" again(2)

Reviewed-by: stefank, eosterlund
…outSuspendTest.java failed with JVMTI_ERROR_INVALID_SLOT

Reviewed-by: sspitsyn, cjplummer
Add release fence to ClassValueMap constructor.

* Release fence guarantees that cacheArray field will published
with a non-null value.
* Without this fix, CacheValueMap.cacheArray can sometimes be
seen as null.

Reviewed-by: shade, psandoz
…required -XX:+CompactStrings

Reviewed-by: rriggs, jlaskey
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 17, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into records-2 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 merge-conflict The pull request has a merge conflict with the target branch rfr Ready for review labels Sep 17, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 17, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 18, 2020

@openjdk-bot This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

Merge master
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the records-2 branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 65431b7b16615b3187cd2a2770b99a805ade5d94.

As you do not have Committer status in this projectan existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Ready to be integrated and removed merge-conflict The pull request has a merge conflict with the target branch labels Sep 18, 2020
@openjdk-bot
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Ready to sponsor label Sep 18, 2020
@openjdk
Copy link

openjdk bot commented Sep 18, 2020

@openjdk-bot
Your change (at version 98f6388) is now ready to be sponsored by a Committer.

@vicente-romero-oracle vicente-romero-oracle merged commit e5efb00 into openjdk:records-2 Sep 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed-auto-merge ready Ready to be integrated rfr Ready for review sponsor Ready to sponsor
Development

Successfully merging this pull request may close these issues.