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

Merge pull request #18392 from slavapestov/error-type-cleanup

Browse Source 
Error type cleanup
This commit is contained in:
Slava Pestov
2018-07-31 11:14:27 -07:00
committed by GitHub
parent 4201f9c37b 3454a54ee3
commit d71ebcd317
14 changed files with 76 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/SILGen/SILGen.cpp
View File

@@ -1204,14 +1204,13 @@ TypeConverter::canStorageUseStoredKeyPathComponent(AbstractStorageDecl *decl) {
M.getSwiftModule());
switch (strategy.getKind()) {
case AccessStrategy::Storage: {
// If the stored value would need to be reabstracted in fully opaque
// context, then we have to treat the component as computed.
auto componentObjTy = decl->getStorageInterfaceType()
->getWithoutSpecifierType();
// Keypaths rely on accessors to handle the special behavior of weak or
// unowned properties.
if (componentObjTy->is<ReferenceStorageType>())
if (decl->getInterfaceType()->is<ReferenceStorageType>())
return false;
// If the stored value would need to be reabstracted in fully opaque
// context, then we have to treat the component as computed.
auto componentObjTy = decl->getValueInterfaceType();
if (auto genericEnv =
decl->getInnermostDeclContext()->getGenericEnvironmentOfContext())
componentObjTy = genericEnv->mapTypeIntoContext(componentObjTy);