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.

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

Bump compiler version to Swift 5. #20374

Merged
merged 9 commits into from Nov 16, 2018
Merged

Bump compiler version to Swift 5. #20374

merged 9 commits into from Nov 16, 2018

Conversation

tkremenek
Copy link
Member

Main pieces:

  • Bump swift-version to 5
  • Remove -swift-version 3 support

Subsumes #18853

@tkremenek
Bump compiler version to Swift 5.
46510a5 
Main pieces:

- Bump swift-version to 5
- Remove -swift-version 3 support
@tkremenek
Copy link
Member Author

@swift-ci test

@tkremenek tkremenek self-assigned this Nov 6, 2018
@tkremenek tkremenek mentioned this pull request Nov 6, 2018
Closed
jrose-apple
jrose-apple reviewed Nov 6, 2018
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.

Code changes look good!

test/SILOptimizer/loweraggregateinstrs_expandall.sil
@@ -37,7 +37,7 @@ struct S {
}

enum E {
case NoElement()
case NoElement(Void)
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick: this one should probably go to case NoElement instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @jrose-apple, but I don't quite understand. This change is needed or else the test fails. The compiler now complains about the missing Void.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's unclear whether the test is supposed to be testing a case with no payload or a case with a zero-sized payload, but given the name of the enum case I'm guessing it's the former.

Copy link
Member

Choose a reason for hiding this comment

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

I think it's the latter. @CodaFi banned enums with an empty tuple payload so that we can stage in the 'normalize enum cases' proposal later without breaking source compatibility, and I recall discussing the intent behind this test case at the time.

nkcsgexi
nkcsgexi approved these changes Nov 6, 2018
View reviewed changes
Copy link
Member

@nkcsgexi nkcsgexi left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you for correcting the migrator test.

@swift-ci
Copy link
Collaborator

swift-ci commented Nov 7, 2018

Build failed
Swift Test Linux Platform
Git Sha - 46510a5

@swift-ci
Copy link
Collaborator

swift-ci commented Nov 7, 2018

Build failed
Swift Test OS X Platform
Git Sha - 46510a5

@tkremenek
Copy link
Member Author

@swift-ci test macOS

@swift-ci
Copy link
Collaborator

swift-ci commented Nov 7, 2018

Build failed
Swift Test OS X Platform
Git Sha - 46510a5

@benrimmington benrimmington mentioned this pull request Nov 7, 2018
Closed
@tkremenek
Merge remote-tracking branch 'upstream/master' into swift5-version
748dae7 
# Conflicts:
#	validation-test/stdlib/HashedCollectionFilter3.swift
#	validation-test/stdlib/HashingPrototype.swift
@tkremenek
Copy link
Member Author

@swift-ci clean test

@swift-ci
Copy link
Collaborator

swift-ci commented Nov 9, 2018

Build failed
Swift Test OS X Platform
Git Sha - 13dea85

@swift-ci
Copy link
Collaborator

swift-ci commented Nov 9, 2018

Build failed
Swift Test Linux Platform
Git Sha - 748dae7

@tkremenek
Copy link
Member Author

Failure building Corelibs-Foundation:

/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-master/swift-corelibs-foundation/Foundation/Unit.swift:1401:30: error: cannot override a Self return type with a non-Self return type
13:54:13     open override class func baseUnit() -> UnitLength {
13:54:13                              ^
13:54:13 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-master/swift-corelibs-foundation/Foundation/Unit.swift:209:21: note: overridden declaration is here
13:54:13     open class func baseUnit() -> Self {
13:54:13

@tkremenek
Copy link
Member Author

Corelibs issue:

apple/swift-corelibs-foundation#1758

@tkremenek tkremenek mentioned this pull request Nov 13, 2018
Merged
@tkremenek
Merge branch 'master' into swift5-version
62799c0 
# Conflicts:
#	test/api-digester/Outputs/stability-stdlib-source.swift.expected
@tkremenek
Copy link
Member Author

@swift-ci test

@swift-ci
Copy link
Collaborator

Build failed
Swift Test Linux Platform
Git Sha - 62799c0

@swift-ci
Copy link
Collaborator

Build failed
Swift Test OS X Platform
Git Sha - 62799c0

@tkremenek
Copy link
Member Author

@swift-ci test

@tkremenek
Copy link
Member Author

@swift-ci test

@swift-ci
Copy link
Collaborator

Build failed
Swift Test OS X Platform
Git Sha - bd703b7

@swift-ci
Copy link
Collaborator

Build failed
Swift Test Linux Platform
Git Sha - bd703b7

@tkremenek
Copy link
Member Author

@swift-ci clean test

@swift-ci
Copy link
Collaborator

Build failed
Swift Test Linux Platform
Git Sha - 4562cc6

@tkremenek
Copy link
Member Author

@swift-ci test linux

@swift-ci
Copy link
Collaborator

Build failed
Swift Test Linux Platform
Git Sha - 4562cc6

@tkremenek
Copy link
Member Author

@swift-ci test linux

@swift-ci
Copy link
Collaborator

Build failed
Swift Test OS X Platform
Git Sha - 4562cc6

@swift-ci
Copy link
Collaborator

Build failed
Swift Test Linux Platform
Git Sha - 4562cc6

@tkremenek
Copy link
Member Author

@swift-ci smoke test

1 similar comment
@tkremenek
Copy link
Member Author

@swift-ci smoke test

@tkremenek
Copy link
Member Author

Waiting on:

apple/swift-corelibs-foundation#1768

@tkremenek
Copy link
Member Author

Please test with apple/swift-corelibs-foundation#1768

@swift-ci smoke test

@tkremenek
Copy link
Member Author

Please test with apple/swift-corelibs-foundation#1768

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

@swift-ci smoke test linux

3 similar comments
@tkremenek
Copy link
Member Author

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

please test with apple/swift-corelibs-xctest#237

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

please test with apple/swift-corelibs-xctest#238

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

please test with apple/swift-corelibs-foundation#1774

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

please test with apple/swift-corelibs-foundation#1775

@swift-ci smoke test linux

1 similar comment
@tkremenek
Copy link
Member Author

please test with apple/swift-corelibs-foundation#1775

@swift-ci smoke test linux

@tkremenek
Copy link
Member Author

@swift-ci smoke test and merge

@tkremenek tkremenek merged commit 6c8bed8 into apple:master Nov 16, 2018
fredriss added a commit to fredriss/swift-lldb that referenced this pull request Nov 16, 2018
@fredriss
Remove PlaygroundQuickLook test.
7b60812 
Historically, this test was verifying some reflection support that was
used for Playgrounds support. Today, through API changes, this was just
testing that we could create an print a specific enum.

With the switch to Swift 5.0 (apple/swift#20374),
this enum is now deprecated and the test fails.

As the coverage provided here seems pretty insignificant, let's just remove
the test.
@fredriss fredriss mentioned this pull request Nov 16, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slavapestov slavapestov slavapestov approved these changes

@jrose-apple jrose-apple jrose-apple left review comments

@nkcsgexi nkcsgexi nkcsgexi approved these changes

@airspeedswift airspeedswift Awaiting requested review from airspeedswift

Assignees

@tkremenek tkremenek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tkremenek @swift-ci @fredriss @slavapestov @nkcsgexi @jrose-apple