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

[ConstraintSystem] Ignore optionals when looking for a concrete base of a static member ref on protocol metatype

Browse Source
This commit is contained in:
Pavel Yaskevich
2020-11-09 14:48:48 -08:00
parent a2ee7f2e6b
commit 9a584550d2
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/ConstraintSystem.cpp
View File

@@ -1591,6 +1591,10 @@ ConstraintSystem::getTypeOfMemberReference(
baseOpenedTy = funcTy->getResult(); baseOpenedTy = funcTy->getResult();
else else
baseOpenedTy = refTy; baseOpenedTy = refTy;
// It should be possible to form optional chains which start
// from a protocol metatype.
baseOpenedTy = baseOpenedTy->lookThroughAllOptionalTypes();
} }
} else if (baseObjTy->isExistentialType()) { } else if (baseObjTy->isExistentialType()) {
auto openedArchetype = OpenedArchetypeType::get(baseObjTy); auto openedArchetype = OpenedArchetypeType::get(baseObjTy);

15
test/Constraints/static_members_on_protocol_metatype.swift
View File

@@ -14,6 +14,9 @@ struct G<T> : P {
extension P { extension P {
static var property: S { S() } static var property: S { S() }
static var iuoProp: S! { S() }
static var optProp: S? { S() }
static var fnProp: () -> S { static var fnProp: () -> S {
{ S() } { S() }
} }
@@ -37,6 +40,10 @@ extension P {
_ = P.property // Ok _ = P.property // Ok
_ = P.property.other // Ok _ = P.property.other // Ok
_ = P.iuoProp // Ok
_ = P.iuoProp.other // Ok
_ = P.optProp // Ok
_ = P.optProp?.other // Ok
_ = P.fnProp // Ok _ = P.fnProp // Ok
_ = P.fnProp() // Ok _ = P.fnProp() // Ok
_ = P.fnProp().other // Ok _ = P.fnProp().other // Ok
@@ -75,6 +82,14 @@ func test<T: P>(_: T) {}
test(.property) // Ok, base is inferred as Style.Type test(.property) // Ok, base is inferred as Style.Type
test(.property.other) // Ok test(.property.other) // Ok
test(.iuoProp) // Ok
test(.iuoProp.other) // Ok
test(.optProp!) // Ok
test(.optProp)
// expected-error@-1 {{value of optional type 'S?' must be unwrapped to a value of type 'S'}}
// expected-note@-2 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
// expected-note@-3 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
test(.optProp!.other) // Ok
test(.fnProp()) // Ok test(.fnProp()) // Ok
test(.fnProp().other) // Ok test(.fnProp().other) // Ok
test(.method()) // Ok, static method call on the metatype test(.method()) // Ok, static method call on the metatype