Skip to content

Swift 4.1 branch #12522

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

Merged
merged 2 commits into from
Oct 25, 2017
Merged

Swift 4.1 branch #12522

merged 2 commits into from
Oct 25, 2017

Conversation

atrick
Copy link
Contributor

@atrick atrick commented Oct 20, 2017

Merge bug fixes into 4.1.

Bug introduced in @NoEscape lowering: #12420

Fixes <rdar://problem/35055251> FAILED: ASAN use-after-free in MandatoryInlining.
Handle function_ref -> convert_function -> thin_to_thick.

Fixes <rdar://problem/35059942> Failed - Lark, 3.0, Swift Package - Source Compatibility Suite (master)
@atrick atrick requested a review from gparker42 October 20, 2017 03:37
@atrick
Copy link
Contributor Author

atrick commented Oct 20, 2017

@swift-ci smoke test.

@atrick atrick requested a review from eeckstein October 20, 2017 16:58
@atrick
Copy link
Contributor Author

atrick commented Oct 20, 2017

@eeckstein is this the correct way to cherry pick into 4.1, and if so can you approve it so I can merge the PR?

Copy link
Contributor

@eeckstein eeckstein left a comment

Choose a reason for hiding this comment

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

MandatoryInlining changes LGTM.
The IRGen changes should be reviewed by someone else

@atrick atrick requested a review from shajrawi October 21, 2017 03:08
@atrick
Copy link
Contributor Author

atrick commented Oct 21, 2017

I'll wait for @shajrawi to review the LoadableAddress changes.

Copy link

@shajrawi shajrawi left a comment

Choose a reason for hiding this comment

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

LGTM

@atrick
Copy link
Contributor Author

atrick commented Oct 24, 2017

@swift-ci smoke test and merge.

@jrose-apple
Copy link
Contributor

Small request: can you title your 4.1 PRs more clearly in the future? I'd like to know what you're doing to the 4.1 branch without having to click into the PR.

@atrick
Copy link
Contributor Author

atrick commented Oct 24, 2017

@shahmishal This PR fixes the bots that were already broken at the time the 4.1 branch was cut. I don't know how to get this merged. Is it something you can do?

@gparker42
Copy link
Contributor

This is a functional change, so you'll need CCC review for the 4.1 branch.

@atrick
Copy link
Contributor Author

atrick commented Oct 24, 2017

@swift-ci nominate.

This does not really need CCC. They are the "emergency" bug fixes for bots that were broken at the time the branch was cut and are completely obvious. I originally didn't intend for anyone else to even look at this PR. But since it took so long for the PR to be merged, we now have an official process. So here goes:

Explanation: Same-day fixes for two broken bots at the time the 4.1 branch was cut.

Scope: ASAN and source-compatibility tests.

Origin: d369aa4 Support @NoEscape SIL function types. (#12420)

Radar:
rdar://problem/35059942 Failed - Lark, 3.0, Swift Package - Source Compatibility Suite (master)
rdar://problem/35055251 FAILED: ASAN use-after-free in MandatoryInlining.

Risk: These are minimally invasive surgical fixes.

Testing: See scope.

@shahmishal
Copy link
Member

@atrick swift-4.1-branch requires full testing, because its under CCC.

@swift-ci test

@shahmishal
Copy link
Member

@swift-ci test source compatibility

@atrick atrick merged commit b699079 into swiftlang:swift-4.1-branch Oct 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants