Swift 4 compatibility hack for redeclaration of properties in generic type and extension #17392
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
"illegal" is an overloaded word and can distress people who aren't familiar with the usage as being illegal with respect to the language definition, not the actual law.
|
@swift-ci please smoke test |
huonw
force-pushed
the
redefinition-swift-4-compat
branch
from
e5ef10d to
76924b9
Compare
|
@swift-ci please smoke test |
jrose-apple
reviewed
Jun 21, 2018
| // matching the Swift 4 behaviour (i.e. just emitting the future-compat | ||
| // warning) will result in SILGen crashes due to both properties mangling | ||
| // the same, so it's better to just follow the Swift 5 behaviour and emit | ||
| // the actual error. |
There was a problem hiding this comment.
Can you add a test case for this?
There was a problem hiding this comment.
The z property in the diff for the overload.swift is this case.
lib/AST/Decl.cpp
Outdated
| @@ -1747,7 +1747,31 @@ bool swift::conflicting(ASTContext &ctx, | |||
| } | |||
|
|
|||
| // Otherwise, the declarations conflict if the overload types are the same. | |||
| return sig1Type == sig2Type; | |||
| if (sig1Type == sig2Type) { | |||
There was a problem hiding this comment.
Suggestion: early return.
…tensions of generic types.
The patch that nailed down our semantics here missed an additional case that
required a compatibility hack: a property on a generic type and a same-named one
in an (unconstrained) extension:
struct Foo<T> {
var x: Int { return 0 }
}
extension Foo {
var x: Bool { return false }
}
Fixes rdar://problem/40685642.
huonw
force-pushed
the
redefinition-swift-4-compat
branch
from
76924b9 to
b96aeda
Compare
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The patch that nailed down our semantics here missed an additional case that
required a compatibility hack: a property on a generic type and a same-named one
in an (unconstrained) extension:
Fixes rdar://problem/40685642.