averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Property Wrappers] Use the outermost wrapper attribute type as the

Browse Source 
contextual type for property wrapper initialization
This commit is contained in:
Holly Borla
2020-04-13 17:13:22 -07:00
parent 829f2588b3
commit df7735e545
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Sema/ConstraintSystem.cpp
View File

@@ -4219,6 +4219,7 @@ void SolutionApplicationTarget::maybeApplyPropertyWrapper() {
// the initializer type later. // the initializer type later.
expression.wrappedVar = singleVar; expression.wrappedVar = singleVar;
expression.expression = backingInitializer; expression.expression = backingInitializer;
expression.convertType = outermostWrapperAttr->getTypeLoc();
} }
SolutionApplicationTarget SolutionApplicationTarget::forInitialization( SolutionApplicationTarget SolutionApplicationTarget::forInitialization(

15
test/Constraints/requirement_failures_in_contextual_type.swift
View File

@@ -19,3 +19,18 @@ let _: A<Int>.C = 0
// expected-error@-1 {{'A<Int>.C' (aka 'Int') requires the types 'Int' and 'Int32' be equivalent}} // expected-error@-1 {{'A<Int>.C' (aka 'Int') requires the types 'Int' and 'Int32' be equivalent}}
let _: A<Int>.B.E = 0 let _: A<Int>.B.E = 0
// expected-error@-1 {{'A<Int>.B' requires the types 'Int' and 'Int32' be equivalent}} // expected-error@-1 {{'A<Int>.B' requires the types 'Int' and 'Int32' be equivalent}}
protocol P {}
@propertyWrapper
struct Wrapper<T: P> { // expected-note {{where 'T' = 'Int'}}
var wrappedValue: T
}
class C {
static let i = 1
@Wrapper // expected-error{{generic struct 'Wrapper' requires that 'Int' conform to 'P'}}
var value = C.i
}