Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[automated] Merge branch 'release/2.1' => 'release/2.2'#24954

Merged
jashook merged 1 commit intodotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2
Jun 6, 2019
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2'#24954
jashook merged 1 commit intodotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2

Conversation

@dotnet-maestro-bot
Copy link

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/coreclr HEAD:merge/release/2.1-to-release/2.2
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/coreclr HEAD:merge/release/2.1-to-release/2.2

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/coreclr merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/coreclr merge/release/2.1-to-release/2.2
or if you are using SSH
git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull [email protected]:dotnet-maestro-bot/coreclr merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/coreclr merge/release/2.1-to-release/2.2

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

* Set flag in comp info to signal that a caller has >8 byte struct args (dotnet#22775)

* Set flag in comp info to signal that a caller has >8 byte struct args

This will be used by fgCanFastTailCall to correctly determine whether an arm64
or x64 linux caller/callee can fastTailCall.
It is also a workaround to #12468 to catch early any slot shuffling that would happen in LowerFastTailCall. Which currently assumes all parameters are one slot size.

* Address feedback

* Apply format patch

* Add comment

* apply new format patch

* Address feedback and add header
@wtgodbe
Copy link
Member

wtgodbe commented Jun 4, 2019

CC @jashook @RussKeldorph

@RussKeldorph
Copy link

@jashook Go ahead and merge if the change is correct.

@jashook jashook merged commit ce1d090 into dotnet:release/2.2 Jun 6, 2019
@vivmishra vivmishra added the Servicing-approved Approved for servicing release label Jul 9, 2019
@vivmishra vivmishra added this to the 2.2.6 milestone Jul 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants