Skip to content

Merge #6547 to 3.1 branch #6736

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jan 12, 2017
Merged

Merge #6547 to 3.1 branch #6736

merged 4 commits into from
Jan 12, 2017

Conversation

ematejska
Copy link
Contributor

Merge #6547 from master to 3.1 branch to fix up source compatibility.

CodaFi added 3 commits January 11, 2017 09:05
@CodaFi
Effectively revert swiftlang#5778
56747b3 
This reverts the contents of swiftlang#5778 and replaces it with a far simpler
implementation of condition resolution along with canImport.  When
combined with the optimizations in swiftlang#6279 we get the best of both worlds
with a performance win and a simpler implementation.
@CodaFi
Fix a crasher
cc70b4b
@CodaFi
Restore local type declarations list
22f02d9
@ematejska
Copy link
Contributor Author

@swift-ci please test

@ematejska ematejska requested a review from jrose-apple January 11, 2017 17:51
jrose-apple
jrose-apple approved these changes Jan 11, 2017
View reviewed changes
Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

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

If it merges cleanly, I think we're good! cc @CodaFi

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 22f02d9
Test requested by - @ematejska

@shahmishal
Copy link
Member

@swift-ci Please test macOS

@ematejska
Copy link
Contributor Author

@swift-ci please test os x

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 22f02d9
Test requested by - @ematejska

@slavapestov
Copy link
Contributor

The playgrounds logger failure is not caused by this patch. We thought it was a regression from my patch but it's still happening after that got reverted too. Ewa, can you ask someone on playgrounds to take a look?

@ematejska
Copy link
Contributor Author

@swift-ci test os x

@ematejska
Copy link
Contributor Author

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 22f02d9
Test requested by - @ematejska

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 22f02d9
Test requested by - @ematejska

@ematejska
Copy link
Contributor Author

@swift-ci please test linux

@ematejska ematejska merged commit 106cadd into swiftlang:swift-3.1-branch Jan 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrose-apple jrose-apple jrose-apple approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ematejska @swift-ci @shahmishal @slavapestov @jrose-apple @CodaFi