Skip to content

[Sema] Fix crashers due to invalid generic decls inside non-generic decls and vice versa #3377

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 1 commit into from
Jul 7, 2016

Conversation

gregomni
Copy link
Contributor

@gregomni gregomni commented Jul 7, 2016

What's in this pull request?

Mark decls that are illegal due to generic inside non-generic decl or non-generic inside generic decl with setInvalid(), and avoid assertions trying to set the superclass on classes in such situations by setting the superclass of an invalid decl to the error type.

This fixes 8 of the validation test compiler crashes, and also changes some errors in other tests where the main error is the invalid declaration and now the downstream errors can be a bit different because the decl has been invalidated.


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

… non-generic inside generic decl with setInvalid(), and avoid assertions

trying to set the superclass on classes in such situations by setting the superclass of an invalid decl to the error type.

This fixes a bunch of compiler crashes, and also changes some errors in other tests where the main error is the invalid declaration and now the
downstream errors can be a bit different because the decl has been invalidated.
@gregomni
Copy link
Contributor Author

gregomni commented Jul 7, 2016

@swift-ci Please test and merge

@gregomni gregomni changed the title Fix crashers due to invalid generic decls inside non-generic decls and vice versa [Sema] Fix crashers due to invalid generic decls inside non-generic decls and vice versa Jul 7, 2016
@swift-ci swift-ci merged commit 3cb429b into swiftlang:master Jul 7, 2016
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.

2 participants