Skip to content

bumping master to Swift 5.0 #18853

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

Closed
wants to merge 3 commits into from
Closed

bumping master to Swift 5.0 #18853

wants to merge 3 commits into from

Conversation

najacque
Copy link
Contributor

This PR bumps the Swift compiler version to 5.0 for the swift master branch.

Resolves rdar://problem/43523881

@najacque
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - d605660

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - d605660

@najacque
Copy link
Contributor Author

Looks like I need to also update getEffectiveLanguageVersion, and per @jrose-apple should not change the crash recovery test...

@jrose-apple
Copy link
Contributor

Ah, here we go: #13843 is what I was looking at back before we confirmed that 4.2 was going to happen. It doesn't answer all the questions about what we should do this time, but it shows what I had to touch then.

@najacque
Copy link
Contributor Author

@swift-ci please smoke test

case 3:
#ifdef SWIFT_VERSION_PATCHLEVEL
return Version{3, 4, SWIFT_VERSION_PATCHLEVEL};
#else
return Version{3, 4};
#endif
case 4:
static_assert(SWIFT_VERSION_MAJOR == 4,
"getCurrentLanguageVersion is no longer correct here");
// Version '4' on its own implies '4.1.50'.
if (size() == 1)
return Version{4, 1, 50};
return Version::getCurrentLanguageVersion();
Copy link
Contributor

Choose a reason for hiding this comment

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

This line here's no longer going to be right. Maybe the whole section should be "If Version >= 4.2, return 4.2, else return 4.1.50".

@tkremenek
Copy link
Member

@najacque I'd be happy to take this over at this point, since I did the surgery here for the 4.2 version bump. Just let me know.

@najacque
Copy link
Contributor Author

@tkremenek, sounds good, I got side tracked with other stuff, so please go ahead.

@tkremenek
Copy link
Member

Subsumed by #20374

@tkremenek tkremenek closed this Nov 6, 2018
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.

4 participants