Skip to content

[5.5][Serialization] Do not assert when inherited type is null #37476

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
May 20, 2021

Conversation

bnbarham
Copy link
Contributor

Cherry-picks #37441


When compiling with allow errors, it's possible to have invalid
inherited types - both null and ErrorType.

Cleaned up the tests a little - moved the majority of
Frontend/allow-errors.swift into separate files in
Serialization/AllowErrors and use split_file.py instead of #defines.

Resolves rdar://78048470

When compiling with allow errors, it's possible to have invalid
inherited types - both null and ErrorType.

Cleaned up the tests a little - moved the majority of
Frontend/allow-errors.swift into separate files in
Serialization/AllowErrors and use split_file.py instead of #defines.

Resolves rdar://78048470
@bnbarham bnbarham added the r5.5 label May 18, 2021
@bnbarham bnbarham requested a review from akyrtzi May 18, 2021 11:03
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - c9ac392

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - c9ac392

@bnbarham
Copy link
Contributor Author

Didn't notice these failed, don't think I got an email with them 🤔. Jobs deleted now so just going to run again.

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - c9ac392

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - c9ac392

There was a change in the diagnostics that isn't in 5.5. The error
message itself doesn't matter too much here, just that there was one.
Simplify the CHECK clause so that it will pass in main and 5.5 to avoid
future conflicts.
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 5d116be

@bnbarham
Copy link
Contributor Author

@swift-ci please test Linux platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 5d116be

@bnbarham
Copy link
Contributor Author

@swift-ci please test Linux platform

@akyrtzi akyrtzi merged commit 3e61fad into swiftlang:release/5.5 May 20, 2021
@bnbarham bnbarham deleted the 5.5-cherry-rdar78048470 branch May 20, 2021 22:50
@AnthonyLatsis AnthonyLatsis added 🍒 release cherry pick Flag: Release branch cherry picks swift 5.5 labels Jan 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 5.5
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants